redefining openproject containers
This commit is contained in:
		| @@ -2,10 +2,9 @@ | |||||||
|     "openprojectpostgres": { |     "openprojectpostgres": { | ||||||
|         "POSTGRES_DB": "#DB_NAME", |         "POSTGRES_DB": "#DB_NAME", | ||||||
|         "POSTGRES_USER": "#DB_USER", |         "POSTGRES_USER": "#DB_USER", | ||||||
|         "POSTGRES_PASSWORD": "#DB_PASSWORD", |         "POSTGRES_PASSWORD": "#DB_PASSWORD" | ||||||
|         "POSTGRES_ROOT_PASSWORD": "#DB_ROOT_PASSWORD" |  | ||||||
|     }, |     }, | ||||||
|     "openprojectapp": { |     "openprojectapp": { | ||||||
|         "DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@openprojectpostgres-db:5432/#DB_NAME/openproject?pool=20&encoding=unicode&reconnect=true" |         "DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@openprojectpostgres-db:5432/#DB_NAME?pool=20&encoding=unicode&reconnect=true" | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -26,7 +26,7 @@ | |||||||
|             "DEPEND": "null", |             "DEPEND": "null", | ||||||
|             "START_ON_BOOT": "false", |             "START_ON_BOOT": "false", | ||||||
|             "ENTRYPOINT": "sh -c", |             "ENTRYPOINT": "sh -c", | ||||||
|             "CMD": "mkdir -p /etc/user/data/openproject/assets && mkdir -p /etc/user/data/openproject/db", |             "CMD": "mkdir -p /etc/user/data/openproject/assets && chown -R 1000:1000 /etc/user/data/openproject/assets && mkdir -p /etc/user/data/openproject/db", | ||||||
|             "PRE_START": "null", |             "PRE_START": "null", | ||||||
|             "POST_START": "null" |             "POST_START": "null" | ||||||
|         }, |         }, | ||||||
| @@ -40,7 +40,7 @@ | |||||||
|             "VOLUMES": [ |             "VOLUMES": [ | ||||||
|                 { |                 { | ||||||
|                     "SOURCE": "/etc/user/data/openproject/db", |                     "SOURCE": "/etc/user/data/openproject/db", | ||||||
|                     "DEST": "/var/lib/postgres", |                     "DEST": "/var/lib/postgresql/data", | ||||||
|                     "TYPE": "rw" |                     "TYPE": "rw" | ||||||
|                 } |                 } | ||||||
|             ], |             ], | ||||||
| @@ -64,9 +64,9 @@ | |||||||
|         { |         { | ||||||
|             "IMAGE": "openproject/openproject:15-slim", |             "IMAGE": "openproject/openproject:15-slim", | ||||||
|             "UPDATE": "true", |             "UPDATE": "true", | ||||||
|             "NAME": "openprojectapp", |             "NAME": "openprojectapp-web", | ||||||
|             "NETWORK": "openproject-net", |             "NETWORK": "openproject-net", | ||||||
|             "SELECTOR": "openprojectapp", |             "SELECTOR": "openprojectapp-web", | ||||||
|             "VOLUMES": [ |             "VOLUMES": [ | ||||||
|                 { |                 { | ||||||
|                     "SOURCE": "/etc/user/data/openproject/assets", |                     "SOURCE": "/etc/user/data/openproject/assets", | ||||||
| @@ -76,20 +76,20 @@ | |||||||
|             ], |             ], | ||||||
|             "PORTS": [ |             "PORTS": [ | ||||||
|                 { |                 { | ||||||
|                     "SOURCE": "null", |                     "SOURCE": "8090", | ||||||
|                     "DEST": "8080", |                     "DEST": "8080", | ||||||
|                     "TYPE": "tcp" |                     "TYPE": "tcp" | ||||||
|                 } |                 } | ||||||
|             ], |             ], | ||||||
|             "ENVS": [ |             "ENVS": [ | ||||||
|                 { |                 { | ||||||
|                     "OPENPROJECT_HTTPS": "true" |                     "OPENPROJECT_HTTPS": "false" | ||||||
|                 }, |                 }, | ||||||
|                 { |                 { | ||||||
|                     "OPENPROJECT_HOST__NAME": "#OPENPROJECT_DOMAIN" |                     "OPENPROJECT_HOST__NAME": "#OPENPROJECT_DOMAIN" | ||||||
|                 }, |                 }, | ||||||
|                 { |                 { | ||||||
|                     "OPENPROJECT_HSTS": "true" |                     "OPENPROJECT_HSTS": "false" | ||||||
|                 }, |                 }, | ||||||
|                 { |                 { | ||||||
|                     "RAILS_CACHE_STORE": "memcache" |                     "RAILS_CACHE_STORE": "memcache" | ||||||
| @@ -101,10 +101,10 @@ | |||||||
|                     "OPENPROJECT_RAILS__RELATIVE__URL__ROOT": "/" |                     "OPENPROJECT_RAILS__RELATIVE__URL__ROOT": "/" | ||||||
|                 }, |                 }, | ||||||
|                 { |                 { | ||||||
|                     "RAILS_MIN_THREADS": "-4" |                     "RAILS_MIN_THREADS": "4" | ||||||
|                 }, |                 }, | ||||||
|                 { |                 { | ||||||
|                     "RAILS_MAX_THREADS": "-16" |                     "RAILS_MAX_THREADS": "16" | ||||||
|                 }, |                 }, | ||||||
|                 { |                 { | ||||||
|                     "IMAP_ENABLED": "true" |                     "IMAP_ENABLED": "true" | ||||||
| @@ -116,7 +116,7 @@ | |||||||
|             "EXTRA": "--restart unless-stopped", |             "EXTRA": "--restart unless-stopped", | ||||||
|             "DEPEND": [], |             "DEPEND": [], | ||||||
|             "START_ON_BOOT": "false", |             "START_ON_BOOT": "false", | ||||||
|             "CMD": "null", |             "CMD": "./docker/prod/web", | ||||||
|             "PRE_START": "null", |             "PRE_START": "null", | ||||||
|             "POST_START": [ |             "POST_START": [ | ||||||
|                 "firewall-openproject", |                 "firewall-openproject", | ||||||
| @@ -130,13 +130,168 @@ | |||||||
|             "UPDATE": "true", |             "UPDATE": "true", | ||||||
|             "NAME": "memcache-app", |             "NAME": "memcache-app", | ||||||
|             "NETWORK": "openproject-net", |             "NETWORK": "openproject-net", | ||||||
|             "SELECTOR": "memcache-app", |  | ||||||
|             "EXTRA": "--restart unless-stopped", |             "EXTRA": "--restart unless-stopped", | ||||||
|             "DEPEND": [], |             "DEPEND": [], | ||||||
|             "START_ON_BOOT": "false", |             "START_ON_BOOT": "false", | ||||||
|             "CMD": "null", |             "CMD": "null", | ||||||
|             "PRE_START": "null", |             "PRE_START": "null", | ||||||
|             "POST_START": [] |             "POST_START": [] | ||||||
|  |         }, | ||||||
|  |         { | ||||||
|  |             "IMAGE": "openproject/openproject:15-slim", | ||||||
|  |             "UPDATE": "true", | ||||||
|  |             "NAME": "openprojectapp-seeder", | ||||||
|  |             "NETWORK": "openproject-net", | ||||||
|  |             "VOLUMES": [ | ||||||
|  |                 { | ||||||
|  |                     "SOURCE": "/etc/user/data/openproject/assets", | ||||||
|  |                     "DEST": "/var/openproject/assets", | ||||||
|  |                     "TYPE": "rw" | ||||||
|  |                 } | ||||||
|  |             ], | ||||||
|  |             "PORTS": [], | ||||||
|  |             "ENVS": [ | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HTTPS": "false" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HOST__NAME": "#OPENPROJECT_DOMAIN" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HSTS": "false" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_CACHE_STORE": "memcache" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_CACHE__MEMCACHE__SERVER": "memcache-app:11211" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_RAILS__RELATIVE__URL__ROOT": "/" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_MIN_THREADS": "4" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_MAX_THREADS": "16" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "IMAP_ENABLED": "true" | ||||||
|  |                 } | ||||||
|  |             ], | ||||||
|  |             "ENV_FILES": [ | ||||||
|  |                 "/etc/user/secret/openproject/openproject.json" | ||||||
|  |             ], | ||||||
|  |             "EXTRA": "--restart on-failure", | ||||||
|  |             "DEPEND": [], | ||||||
|  |             "START_ON_BOOT": "false", | ||||||
|  |             "CMD": "./docker/prod/seeder", | ||||||
|  |             "PRE_START": "null", | ||||||
|  |             "POST_START": [] | ||||||
|  |         }, | ||||||
|  |         { | ||||||
|  |             "IMAGE": "openproject/openproject:15-slim", | ||||||
|  |             "UPDATE": "true", | ||||||
|  |             "NAME": "openprojectapp-worker", | ||||||
|  |             "NETWORK": "openproject-net", | ||||||
|  |             "VOLUMES": [ | ||||||
|  |                 { | ||||||
|  |                     "SOURCE": "/etc/user/data/openproject/assets", | ||||||
|  |                     "DEST": "/var/openproject/assets", | ||||||
|  |                     "TYPE": "rw" | ||||||
|  |                 } | ||||||
|  |             ], | ||||||
|  |             "PORTS": [], | ||||||
|  |             "ENVS": [ | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HTTPS": "false" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HOST__NAME": "#OPENPROJECT_DOMAIN" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HSTS": "false" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_CACHE_STORE": "memcache" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_CACHE__MEMCACHE__SERVER": "memcache-app:11211" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_RAILS__RELATIVE__URL__ROOT": "/" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_MIN_THREADS": "4" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_MAX_THREADS": "16" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "IMAP_ENABLED": "true" | ||||||
|  |                 } | ||||||
|  |             ], | ||||||
|  |             "ENV_FILES": [ | ||||||
|  |                 "/etc/user/secret/openproject/openproject.json" | ||||||
|  |             ], | ||||||
|  |             "EXTRA": "--restart unless-stopped", | ||||||
|  |             "DEPEND": [], | ||||||
|  |             "START_ON_BOOT": "false", | ||||||
|  |             "CMD": "./docker/prod/worker", | ||||||
|  |             "PRE_START": "null", | ||||||
|  |             "POST_START": [] | ||||||
|  |         }, | ||||||
|  |         { | ||||||
|  |             "IMAGE": "openproject/openproject:15-slim", | ||||||
|  |             "UPDATE": "true", | ||||||
|  |             "NAME": "openprojectapp-worker", | ||||||
|  |             "NETWORK": "openproject-net", | ||||||
|  |             "VOLUMES": [ | ||||||
|  |                 { | ||||||
|  |                     "SOURCE": "/etc/user/data/openproject/assets", | ||||||
|  |                     "DEST": "/var/openproject/assets", | ||||||
|  |                     "TYPE": "rw" | ||||||
|  |                 } | ||||||
|  |             ], | ||||||
|  |             "PORTS": [], | ||||||
|  |             "ENVS": [ | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HTTPS": "false" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HOST__NAME": "#OPENPROJECT_DOMAIN" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_HSTS": "false" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_CACHE_STORE": "memcache" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_CACHE__MEMCACHE__SERVER": "memcache-app:11211" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "OPENPROJECT_RAILS__RELATIVE__URL__ROOT": "/" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_MIN_THREADS": "4" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "RAILS_MAX_THREADS": "16" | ||||||
|  |                 }, | ||||||
|  |                 { | ||||||
|  |                     "IMAP_ENABLED": "true" | ||||||
|  |                 } | ||||||
|  |             ], | ||||||
|  |             "ENV_FILES": [ | ||||||
|  |                 "/etc/user/secret/openproject/openproject.json" | ||||||
|  |             ], | ||||||
|  |             "EXTRA": "--restart unless-stopped", | ||||||
|  |             "DEPEND": [], | ||||||
|  |             "START_ON_BOOT": "false", | ||||||
|  |             "CMD": "./docker/prod/cron", | ||||||
|  |             "PRE_START": "null", | ||||||
|  |             "POST_START": [] | ||||||
|         } |         } | ||||||
|     ] |     ] | ||||||
| } | } | ||||||
		Reference in New Issue
	
	Block a user