diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 49064fb..28514eb 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -7,16 +7,10 @@ services: args: uid: ${UID} environment: - - CI_ENVIRONMENT=production - APACHE_RUN_USER=#${UID} - APACHE_RUN_GROUP=#${UID} - #- CI_ENV + - CI_ENVIRONMENT=${CI_ENVIRONMENT:-production} - CI_CONFIG - - MAIN_DATABASE_IP="10.13.3.60" - - MAIN_DATABASE_USERNAME="merms_panel" - - MAIN_DATABASE_PASSWORD="merms_panel" - - MAIN_DATABASE="merms_panel" - - MAIN_DATABASE_PORT="5432" restart: unless-stopped image: registry.chiefsoft.net/mermsprovision:latest volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 93a5ee3..f30c7ee 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ services: args: uid: ${UID} environment: - - CI_ENVIRONMENT=development - APACHE_RUN_USER=#${UID} - APACHE_RUN_GROUP=#${UID} - CI_ENVIRONMENT=${CI_ENVIRONMENT:-development}