diff --git a/docker/sidekiq-entrypoint.sh b/docker/sidekiq-entrypoint.sh index a24ba39e..e381ceaf 100644 --- a/docker/sidekiq-entrypoint.sh +++ b/docker/sidekiq-entrypoint.sh @@ -15,13 +15,6 @@ if [ -n "$DATABASE_URL" ]; then DATABASE_USERNAME="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $4}')" DATABASE_PASSWORD="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $5}')" DATABASE_NAME="$(echo $DATABASE_URL | awk -F[@/] '{print $5}')" -else - # Use existing environment variables - DATABASE_HOST="${DATABASE_HOST}" - DATABASE_PORT="${DATABASE_PORT}" - DATABASE_USERNAME="${DATABASE_USERNAME}" - DATABASE_PASSWORD="${DATABASE_PASSWORD}" - DATABASE_NAME="${DATABASE_NAME}" fi # Wait for the database to become available diff --git a/docker/web-entrypoint.sh b/docker/web-entrypoint.sh index ec5ea988..9690cf9e 100644 --- a/docker/web-entrypoint.sh +++ b/docker/web-entrypoint.sh @@ -15,13 +15,6 @@ if [ -n "$DATABASE_URL" ]; then DATABASE_USERNAME="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $4}')" DATABASE_PASSWORD="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $5}')" DATABASE_NAME="$(echo "$DATABASE_URL" | awk -F[@/] '{print $5}')" -else - # Use existing environment variables - DATABASE_HOST="${DATABASE_HOST}" - DATABASE_PORT="${DATABASE_PORT}" - DATABASE_USERNAME="${DATABASE_USERNAME}" - DATABASE_PASSWORD="${DATABASE_PASSWORD}" - DATABASE_NAME="${DATABASE_NAME}" fi # Remove pre-existing puma/passenger server.pid