diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 2e3c4e7..c4c8bb9 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -26,7 +26,7 @@ services: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - TZ=${TIMEZONE} - - COMPOSE_VERSION=02c + - COMPOSE_VERSION=02d - COMPOSE_TYPE=with-postgres volumes: diff --git a/docker-compose-no-postgres.yml b/docker-compose-no-postgres.yml index 1462224..139db91 100644 --- a/docker-compose-no-postgres.yml +++ b/docker-compose-no-postgres.yml @@ -13,7 +13,7 @@ services: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - TZ=${TIMEZONE} - - COMPOSE_VERSION=02c + - COMPOSE_VERSION=02d - COMPOSE_TYPE=no-postgres volumes: - sqlite_volume:/var/lib/routerfleet_sqlite/ diff --git a/docker-compose.yml b/docker-compose.yml index 3ca574a..6164bef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - TZ=${TIMEZONE} - - COMPOSE_VERSION=02c + - COMPOSE_VERSION=02d - COMPOSE_TYPE=with-postgres volumes: - sqlite_volume:/var/lib/routerfleet_sqlite/ diff --git a/entrypoint.sh b/entrypoint.sh index b02333d..f791670 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,7 @@ PRODUCTION_SETTINGS_FILE="/app/routerfleet/production_settings.py" set -e -if [[ "$COMPOSE_VERSION" != "02c" ]]; then +if [[ "$COMPOSE_VERSION" != "02d" ]]; then echo "ERROR: Please upgrade your docker compose file. Exiting." exit 1 fi @@ -66,9 +66,11 @@ if [[ "${DEBUG_MODE,,}" == "true" ]]; then DEBUG_VALUE="True" fi +SERVER_HOSTNAME=$(echo $SERVER_ADDRESS | cut -d ':' -f 1) + cat > $PRODUCTION_SETTINGS_FILE <