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 to include nginx

Browse source 
Also fix .env.production ENV var name
This commit is contained in:
Ari Timonen 2020-10-09 23:06:08 +03:00
parent 506caad06a
commit 0891552af1
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.production
View file

@ -7,11 +7,11 @@ ASSETS_PRECOMPILE=1
SCRYPT_MAX_TIME=0.001 SCRYPT_MAX_TIME=0.001
# FIXME Disable workers + cluster mode for now. # FIXME Disable workers + cluster mode for now. They break start up.
PUMA_WORKERS=0 PUMA_WORKERS=0
PUMA_MIN_THREADS=1 PUMA_MIN_THREADS=1
PUMA_MAX_THREADS=32 PUMA_MAX_THREADS=32
PUMA_PORT=4000 PRODUCTION_PUMA_PORT=4000
PUMA_TIMEOUT=30 PUMA_TIMEOUT=30
PRODUCTION_ROOT_DOMAIN=ensl.org PRODUCTION_ROOT_DOMAIN=ensl.org

28
docker-compose.yml
View file

@ -154,23 +154,31 @@ services:
container_name: ensl_nginx container_name: ensl_nginx
tty: true tty: true
stdin_open: true stdin_open: true
command: /bin/bash -c "envsubst '$$PUMA_PORT $$APP_PATH $$APP_PATH_PUBLIC $$STAGING_ROOT_DOMAIN $$STAGING_DOMAIN $$STAGING_PORT $$STAGING_PORT_SSL' < /etc/nginx/conf.d/*.conf.template > /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
volumes: volumes:
- ./ext/ssl:/etc/ssl/ensl - ../../ensl/ensl.org/ext/ssl:/etc/ssl/ensl
- ./ext/nginx.conf.d/:/etc/nginx/conf.d/ - ../../ensl/ensl.org/public:/var/www/public
- ./public:/var/www/public - ../../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/app/public:/var/staging/public
# TODO: use env vars here
ports: ports:
- $STAGING_PORT:$STAGING_PORT - 80:80
- $STAGING_PORT_SSL:$STAGING_PORT_SSL - 443:443
- 5000:5000
environment: environment:
- PUMA_PORT=$PUMA_PORT - PRODUCTION_PUMA_PORT=$PRODUCTION_PUMA_PORT
- PRODUCTION_ROOT_DOMAIN=$PRODUCTION_ROOT_DOMAIN
- PRODUCTION_DOMAIN=$PRODUCTION_DOMAIN
- PRODUCTION_PORT=$PRODUCTION_PORT
- PRODUCTION_PORT_SSL=$PRODUCTION_PORT_SSL
- 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
- STAGING_PORT=$STAGING_PORT - STAGING_PORT=$STAGING_PORT
- STAGING_PORT_SSL=$STAGING_PORT_SSL - STAGING_PORT_SSL=$STAGING_PORT_SSL
- RAILS_ENV=$RAILS_ENV - STAGING_NGINX_PUBLIC=$STAGING_APP_PATH_PUBLIC
- APP_PATH=$APP_PATH
- APP_PATH_PUBLIC=$APP_PATH_PUBLIC
# spring: # spring:
# build: # build: