ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-27 11:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to use catpack network

Browse source
This commit is contained in:
Ari Timonen 2020-10-30 02:19:35 +01:00
parent 977d64e579
commit 5fab5f84a3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
docker-compose.yml
View file

@ -157,10 +157,10 @@ services:
command: /bin/bash -c "cat /etc/nginx/conf.d/ensl_production/prod*.conf.template|envsubst '$$PRODUCTION_PUMA_PORT $$PRODUCTION_ROOT_DOMAIN $$PRODUCTION_DOMAIN $$PRODUCTION_PORT $$PRODUCTION_PORT_SSL $$PRODUCTION_NGINX_PUBLIC $$PUMA_PORT $$APP_PATH $$APP_PATH_PUBLIC $$STAGING_ROOT_DOMAIN $$STAGING_DOMAIN $$STAGING_PORT $$STAGING_PORT_SSL' > /etc/nginx/conf.d/default.conf && cat /etc/nginx/conf.d/*.conf && nginx -g 'daemon off;'" command: /bin/bash -c "cat /etc/nginx/conf.d/ensl_production/prod*.conf.template|envsubst '$$PRODUCTION_PUMA_PORT $$PRODUCTION_ROOT_DOMAIN $$PRODUCTION_DOMAIN $$PRODUCTION_PORT $$PRODUCTION_PORT_SSL $$PRODUCTION_NGINX_PUBLIC $$PUMA_PORT $$APP_PATH $$APP_PATH_PUBLIC $$STAGING_ROOT_DOMAIN $$STAGING_DOMAIN $$STAGING_PORT $$STAGING_PORT_SSL' > /etc/nginx/conf.d/default.conf && cat /etc/nginx/conf.d/*.conf && nginx -g 'daemon off;'"
# TODO: use env vars here # TODO: use env vars here
volumes: volumes:
- ext/ssl:/etc/ssl - ./ext/ssl:/etc/ssl
- public/:/var/www - ./public/:/var/www
- ext/nginx.conf.d:/etc/nginx/conf.d/ensl_production - ./ext/nginx.conf.d:/etc/nginx/conf.d/ensl_production
- ext/nginx.conf.d:/etc/nginx/conf.d/ensl_staging - ./ext/nginx.conf.d:/etc/nginx/conf.d/ensl_staging
- ../ensl.org.staging/app/public:/var/staging/public - ../ensl.org.staging/app/public:/var/staging/public
# TODO: use env vars here # TODO: use env vars here
ports: ports:
@ -195,3 +195,8 @@ services:
# commands, but it is necessary for "spring status" and "spring stop" # commands, but it is necessary for "spring status" and "spring stop"
# to work properly. # to work properly.
# pid: host # pid: host
networks:
default:
external:
name: catpack_docker