Porównaj commity

...

3 Commity

Autor SHA1 Wiadomość Data
Sævar Öfjörð Magnússon 6e03972979 Upgrade to node version 20 2023-11-11 22:30:13 +00:00
John-Scott Atlakson 849497e87a Removed `bakerydemo-settings-local.py.example`
This file never worked, it caused a circular import loop since it attempts to `from bakerydemo.settings.dev import *` but the dev settings does:

```python
try:
    from .local import *  # noqa
except ImportError:
    pass
```

Fixed the `setup.sh` script to set the correct settings module environment variable

Fixes #68
2023-11-11 21:58:05 +00:00
John-Scott Atlakson 0d4b9c6335 Remove uninterpreted environment variable from `docker-compose.yml`
This caused a spurious warning when running `docker compose` commands because `$PYTHONPATH` is not defined on the docker _host_ and docker attempted to interpret it as if it were any other environment variable e.g. `$DB_USER`, etc.

All it accomplished was to add a non-existent directory to the path:

```bash
docker compose run web bash
root@2bc54a69fd5c:/code/bakerydemo# echo $PYTHONPATH
/code/wagtail:/code/bakerydemo:$PYTHONPATH

root@2bc54a69fd5c:/code/bakerydemo# python -c "import sys; print('\n'.join(sys.path))"

/code/wagtail
/code/bakerydemo
/code/bakerydemo/$PYTHONPATH
/usr/local/lib/python38.zip
/usr/local/lib/python3.8
/usr/local/lib/python3.8/lib-dynload
/usr/local/lib/python3.8/site-packages
/code/willow
```

Fixes #56
2023-11-11 13:16:25 +00:00
4 zmienionych plików z 4 dodań i 10 usunięć

Wyświetl plik

@ -1,4 +1,4 @@
FROM node:18-slim
FROM node:20-slim
LABEL maintainer="hello@wagtail.org"
RUN apt-get update && apt-get install rsync make -y

Wyświetl plik

@ -1,6 +0,0 @@
from bakerydemo.settings.dev import * # noqa
import dj_database_url
# Override settings here
db_from_env = dj_database_url.config(conn_max_age=500)
DATABASES['default'].update(db_from_env)

Wyświetl plik

@ -19,7 +19,7 @@ services:
- "8000:8000"
environment:
DATABASE_URL: "postgres://wagtail:changeme@db/wagtail"
PYTHONPATH: "/code/wagtail:/code/bakerydemo:$PYTHONPATH"
PYTHONPATH: "/code/wagtail:/code/bakerydemo"
depends_on:
- db
- frontend

Wyświetl plik

@ -37,11 +37,11 @@ fi
# Set up bakerydemo to use the Postgres database in the sister container
if [ ! -f bakerydemo/bakerydemo/settings/local.py ]; then
echo "Creating local settings file"
cp bakerydemo-settings-local.py.example bakerydemo/bakerydemo/settings/local.py
cp bakerydemo/bakerydemo/settings/local.py.example bakerydemo/bakerydemo/settings/local.py
fi
# Create a blank .env file in bakerydemo to keep its settings files from complaining
if [ ! -f bakerydemo/.env ]; then
echo "Creating file for local environment variables"
echo "DJANGO_SETTINGS_MODULE=bakerydemo.settings.local" > bakerydemo/.env
echo "DJANGO_SETTINGS_MODULE=bakerydemo.settings.dev" > bakerydemo/.env
fi