diff --git a/.env.example b/.env.example index a3d3649..b111c44 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,7 @@ # Project PROJECT_NAME=ktvcentral -APP_DOMAIN=https://ktvcentral.test +APP_DOMAIN=ktvcentral.test +APP_URL=https://ktvcentral.test LETSENCRYPT_EMAIL=you@example.com # Git diff --git a/docker-compose.yaml b/docker-compose.yaml index 2f5d3c7..cc48fd2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: LETSENCRYPT_HOST: ${APP_DOMAIN} LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL} GIT_REPO_URL: ${GIT_REPO_URL} - APP_DOMAIN: ${APP_DOMAIN} + APP_URL: ${APP_URL} DB_DATABASE: ${DB_DATABASE} DB_USERNAME: ${DB_USERNAME} DB_PASSWORD: ${DB_PASSWORD} diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 9be11a1..b5dc314 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -2,7 +2,7 @@ cd /var/www -APP_DOMAIN="${APP_DOMAIN%/}" +APP_URL="${APP_URL%/}" : "${REDIS_HOST:=redis}" : "${REDIS_PORT:=6379}" @@ -37,8 +37,8 @@ update_env_var() { echo "${key}=${value}" >> .env } -update_env_var "APP_URL" "$APP_DOMAIN" -update_env_var "L5_SWAGGER_CONST_HOST" "$APP_DOMAIN" +update_env_var "APP_URL" "$APP_URL" +update_env_var "L5_SWAGGER_CONST_HOST" "$APP_URL" update_env_var "DB_DATABASE" "$DB_DATABASE" update_env_var "DB_USERNAME" "$DB_USERNAME" update_env_var "DB_PASSWORD" "$DB_PASSWORD"