Split environment variables out into a .env file

- No need to collect "static" file when we are running in DEBUG mode
This commit is contained in:
Oliver Walters 2021-05-12 21:15:53 +10:00
parent 3381c5e257
commit 00c5a88383
4 changed files with 17 additions and 19 deletions

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ var/
*.log *.log
local_settings.py local_settings.py
*.sqlite3 *.sqlite3
*.sqlite3-journal
*.backup *.backup
*.old *.old

7
docker/dev-config.env Normal file
View File

@ -0,0 +1,7 @@
INVENTREE_DB_ENGINE=sqlite3
INVENTREE_DB_NAME=/home/inventree/src/inventree_docker_dev.sqlite3
INVENTREE_MEDIA_ROOT=/home/inventree/src/inventree_media
INVENTREE_STATIC_ROOT=/home/inventree/src/inventree_static
INVENTREE_CONFIG_FILE=/home/inventree/src/config.yaml
INVENTREE_SECRET_KEY_FILE=/home/inventree/src/secret_key.txt
INVENTREE_DEBUG=true

View File

@ -23,14 +23,10 @@ services:
volumes: volumes:
# Ensure you specify the location of the 'src' directory at the end of this file # Ensure you specify the location of the 'src' directory at the end of this file
- src:/home/inventree/src - src:/home/inventree/src
environment: env_file:
# Configure a simple sqlite server for development # Environment variables required for the dev server are configured in dev-config.env
# Note: You can always change to a different database backend if required! - dev-config.env
- INVENTREE_DB_ENGINE=sqlite3
- INVENTREE_DB_NAME=/home/inventree/data/inventree_database.sqlite3
- INVENTREE_MEDIA_ROOT=/home/inventree/src/inventree_media
- INVENTREE_STATIC_ROOT=/home/inventree/src/inventree_static
- INVENTREE_CONFIG_FILE=/home/inventree/src/config.yaml
restart: unless-stopped restart: unless-stopped
# Background worker process handles long-running or periodic tasks # Background worker process handles long-running or periodic tasks
@ -44,13 +40,9 @@ services:
volumes: volumes:
# Ensure you specify the location of the 'src' directory at the end of this file # Ensure you specify the location of the 'src' directory at the end of this file
- src:/home/inventree/src - src:/home/inventree/src
environment: env_file:
# Configure a simple sqlite server for development # Environment variables required for the dev server are configured in dev-config.env
# Note: You can always change to a different database backend if required! - dev-config.env
- INVENTREE_DB_ENGINE=sqlite3
- INVENTREE_DB_NAME=/home/inventree/data/inventree_database.sqlite3
- INVENTREE_MEDIA_ROOT=/home/inventree/src/inventree_media
- INVENTREE_STATIC_ROOT=/home/inventree/src/inventree_static
restart: unless-stopped restart: unless-stopped
volumes: volumes:

View File

@ -35,16 +35,14 @@ python manage.py wait_for_db
sleep 10 sleep 10
echo "Running InvenTree database migrations and collecting static files..." echo "Running InvenTree database migrations..."
# We assume at this stage that the database is up and running # We assume at this stage that the database is up and running
# Ensure that the database schema are up to date # Ensure that the database schema are up to date
python manage.py check || exit 1 python manage.py check || exit 1
python manage.py migrate --noinput || exit 1 python manage.py migrate --noinput || exit 1
python manage.py migrate --run-syncdb || exit 1 python manage.py migrate --run-syncdb || exit 1
python manage.py prerender || exit 1
python manage.py collectstatic --noinput || exit 1
python manage.py clearsessions || exit 1 python manage.py clearsessions || exit 1
# Launch a development server # Launch a development server
python manage.py runserver -a 0.0.0.0:$INVENTREE_WEB_PORT python manage.py runserver 0.0.0.0:$INVENTREE_WEB_PORT