ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-26 04:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update docker-compose

Browse source
This commit is contained in:
Ari Timonen 2020-10-09 23:37:16 +03:00
parent b25f45d3d3
commit 7cf4636a1c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.production
View file

@ -18,7 +18,7 @@ PRODUCTION_ROOT_DOMAIN=ensl.org
PRODUCTION_DOMAIN=www.ensl.org PRODUCTION_DOMAIN=www.ensl.org
PRODUCTION_PORT=80 PRODUCTION_PORT=80
PRODUCTION_PORT_SSL=443 PRODUCTION_PORT_SSL=443
PRODUCTION_NGINX_PATH=/var/www PRODUCTION_NGINX_PUBLIC=/var/www
MYSQL_DATABASE=ensl MYSQL_DATABASE=ensl
MYSQL_CONNECTION_POOL=48 MYSQL_CONNECTION_POOL=48

3
docker-compose.yml
View file

@ -157,7 +157,7 @@ services:
command: /bin/bash -c "cat /etc/nginx/conf.d/ensl_production/*.conf.template|envsubst '$$PRODUCTION_PUMA_PORT $$PRODUCTION_ROOT_DOMAIN $$PRODUCTION_DOMAIN $$PRODUCTION_PORT $$PRODUCTION_PORT_SSL $$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/*.conf.template|envsubst '$$PRODUCTION_PUMA_PORT $$PRODUCTION_ROOT_DOMAIN $$PRODUCTION_DOMAIN $$PRODUCTION_PORT $$PRODUCTION_PORT_SSL $$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:
- ../../ensl/ensl.org/ext/ssl:/etc/ssl/ensl - ../../ensl/ensl.org/ext/ssl:/etc/ssl
- ../../ensl/ensl.org/public:/var/www/public - ../../ensl/ensl.org/public:/var/www/public
- ../../ensl/ensl.org/ext/nginx.conf.d:/etc/nginx/conf.d/ensl_production - ../../ensl/ensl.org/ext/nginx.conf.d:/etc/nginx/conf.d/ensl_production
- ../../ensl/ensl.org.staging/ext/nginx.conf.d:/etc/nginx/conf.d/ensl_staging - ../../ensl/ensl.org.staging/ext/nginx.conf.d:/etc/nginx/conf.d/ensl_staging
@ -173,6 +173,7 @@ services:
- PRODUCTION_DOMAIN=$PRODUCTION_DOMAIN - PRODUCTION_DOMAIN=$PRODUCTION_DOMAIN
- PRODUCTION_PORT=$PRODUCTION_PORT - PRODUCTION_PORT=$PRODUCTION_PORT
- PRODUCTION_PORT_SSL=$PRODUCTION_PORT_SSL - PRODUCTION_PORT_SSL=$PRODUCTION_PORT_SSL
- PRODUCTION_NGINX_PUBLIC=$PRODUCTION_NGINX_PUBLIC
- STAGING_PUMA_PORT=$STAGING_PUMA_PORT - STAGING_PUMA_PORT=$STAGING_PUMA_PORT
- STAGING_ROOT_DOMAIN=$STAGING_ROOT_DOMAIN - STAGING_ROOT_DOMAIN=$STAGING_ROOT_DOMAIN
- STAGING_DOMAIN=$STAGING_DOMAIN - STAGING_DOMAIN=$STAGING_DOMAIN