diff --git a/docker-compose.production.yml b/docker-compose.production.yml new file mode 100644 index 0000000..49064fb --- /dev/null +++ b/docker-compose.production.yml @@ -0,0 +1,36 @@ +#version: '3' +services: + merms-provision: + build: + context: . + dockerfile: docker/apache/Dockerfile + args: + uid: ${UID} + environment: + - CI_ENVIRONMENT=production + - APACHE_RUN_USER=#${UID} + - APACHE_RUN_GROUP=#${UID} + #- CI_ENV + - 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: + - ./:/var/www/html + - ./ANSIBLE:/var/www/html/ANSIBLE + - ./apache_log:/var/log/apache2 + ports: + - "${CONTAINER_PORT}:80" + extra_hosts: + - api.mermsemr.com:10.10.33.15 + - devapi.mermsemr.com:10.10.33.15 + - devsocket.mermsemr.com:10.10.33.15 + - socket.mermsemr.com:10.10.33.15 + - dev-media.mermsemr.com:10.10.33.15 + - media.mermsemr.com:10.10.33.15 +volumes: + src: diff --git a/docker-compose.yml b/docker-compose.yml index aa9f573..347d9ca 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +#version: '3' services: merms-provision: build: @@ -7,6 +7,7 @@ services: args: uid: ${UID} environment: + - CI_ENVIRONMENT=development - APACHE_RUN_USER=#${UID} - APACHE_RUN_GROUP=#${UID} #- CI_ENV @@ -20,7 +21,11 @@ services: ports: - "${CONTAINER_PORT}:80" extra_hosts: - - oameye.works.wrenchboard.com:10.20.30.27 - - oameye.work.wrenchboard.com:10.10.33.15 + - api.mermsemr.com:10.10.33.15 + - devapi.mermsemr.com:10.10.33.15 + - devsocket.mermsemr.com:10.10.33.15 + - socket.mermsemr.com:10.10.33.15 + - dev-media.mermsemr.com:10.10.33.15 + - media.mermsemr.com:10.10.33.15 volumes: src: