Version 4.7.1; sync labels
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
a530575049
commit
fa7ea3c599
36
compose.yml
36
compose.yml
|
@ -1,6 +1,4 @@
|
||||||
---
|
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
x-env: &env
|
x-env: &env
|
||||||
DOMAIN:
|
DOMAIN:
|
||||||
EMAIL_ERROR:
|
EMAIL_ERROR:
|
||||||
|
@ -33,7 +31,6 @@ x-env: &env
|
||||||
SMTP_PASSWORD_FILE: /run/secrets/smtp_password
|
SMTP_PASSWORD_FILE: /run/secrets/smtp_password
|
||||||
SMTP_PORT:
|
SMTP_PORT:
|
||||||
SMTP_USER_NAME:
|
SMTP_USER_NAME:
|
||||||
|
|
||||||
x-configs: &configs
|
x-configs: &configs
|
||||||
- source: app_config
|
- source: app_config
|
||||||
target: /usr/src/app/config/app_config.yml
|
target: /usr/src/app/config/app_config.yml
|
||||||
|
@ -44,12 +41,10 @@ x-configs: &configs
|
||||||
- source: entrypoint
|
- source: entrypoint
|
||||||
target: /usr/src/app/docker-entrypoint.sh
|
target: /usr/src/app/docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
|
||||||
x-secrets: &secrets
|
x-secrets: &secrets
|
||||||
- db_password
|
- db_password
|
||||||
- secret_key_base
|
- secret_key_base
|
||||||
- smtp_password
|
- smtp_password
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: &image foodcoops/foodsoft:4.7.1
|
image: &image foodcoops/foodsoft:4.7.1
|
||||||
|
@ -60,7 +55,7 @@ services:
|
||||||
configs: *configs
|
configs: *configs
|
||||||
entrypoint: &entrypoint /usr/src/app/docker-entrypoint.sh
|
entrypoint: &entrypoint /usr/src/app/docker-entrypoint.sh
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
!!merge <<: *env
|
||||||
FOODSOFT_SERVICE: app
|
FOODSOFT_SERVICE: app
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
||||||
|
@ -78,36 +73,40 @@ services:
|
||||||
- "traefik.http.routers.foodsoft.entrypoints=web-secure"
|
- "traefik.http.routers.foodsoft.entrypoints=web-secure"
|
||||||
- "traefik.http.services.foodsoft.loadbalancer.server.port=3000"
|
- "traefik.http.services.foodsoft.loadbalancer.server.port=3000"
|
||||||
- "traefik.http.routers.foodsoft.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.foodsoft.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
|
- coop-cloud.${STACK_NAME}.app.version=4.7.1-99afb9a3
|
||||||
cron:
|
cron:
|
||||||
image: *image
|
image: *image
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
!!merge <<: *env
|
||||||
FOODSOFT_SERVICE: cron
|
FOODSOFT_SERVICE: cron
|
||||||
configs: *configs
|
configs: *configs
|
||||||
entrypoint: *entrypoint
|
entrypoint: *entrypoint
|
||||||
secrets: *secrets
|
secrets: *secrets
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- coop-cloud.${STACK_NAME}.cron.version=*image-
|
||||||
worker:
|
worker:
|
||||||
image: *image
|
image: *image
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
!!merge <<: *env
|
||||||
FOODSOFT_SERVICE: worker
|
FOODSOFT_SERVICE: worker
|
||||||
configs: *configs
|
configs: *configs
|
||||||
entrypoint: *entrypoint
|
entrypoint: *entrypoint
|
||||||
secrets: *secrets
|
secrets: *secrets
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- coop-cloud.${STACK_NAME}.worker.version=*image-
|
||||||
smtp:
|
smtp:
|
||||||
image: *image
|
image: *image
|
||||||
configs: *configs
|
configs: *configs
|
||||||
entrypoint: *entrypoint
|
entrypoint: *entrypoint
|
||||||
secrets: *secrets
|
secrets: *secrets
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
!!merge <<: *env
|
||||||
FOODSOFT_SERVICE: smtp
|
FOODSOFT_SERVICE: smtp
|
||||||
SMTP_SERVER_HOST:
|
SMTP_SERVER_HOST:
|
||||||
SMTP_SERVER_PORT:
|
SMTP_SERVER_PORT:
|
||||||
|
@ -120,7 +119,7 @@ services:
|
||||||
- "traefik.tcp.routers.foodsoft-smtp.rule=HostSNI(`*`)"
|
- "traefik.tcp.routers.foodsoft-smtp.rule=HostSNI(`*`)"
|
||||||
- "traefik.tcp.routers.foodsoft-smtp.entrypoints=foodsoft-smtp"
|
- "traefik.tcp.routers.foodsoft-smtp.entrypoints=foodsoft-smtp"
|
||||||
- "traefik.tcp.services.foodsoft-smtp.loadbalancer.server.port=${SMTP_SERVER_PORT}"
|
- "traefik.tcp.services.foodsoft-smtp.loadbalancer.server.port=${SMTP_SERVER_PORT}"
|
||||||
|
- coop-cloud.${STACK_NAME}.smtp.version=*image-
|
||||||
db:
|
db:
|
||||||
image: "mariadb:10.6"
|
image: "mariadb:10.6"
|
||||||
command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci"
|
command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci"
|
||||||
|
@ -136,20 +135,22 @@ services:
|
||||||
- "db:/var/lib/mysql"
|
- "db:/var/lib/mysql"
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- coop-cloud.${STACK_NAME}.db.version=10.6-171746d0
|
||||||
cache:
|
cache:
|
||||||
image: "redis:6"
|
image: "redis:6"
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- coop-cloud.${STACK_NAME}.cache.version=6-7e2c6181
|
||||||
networks:
|
networks:
|
||||||
internal:
|
internal:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
db:
|
db:
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
app_config:
|
app_config:
|
||||||
name: ${STACK_NAME}_app_config_${APP_CONFIG_VERSION}
|
name: ${STACK_NAME}_app_config_${APP_CONFIG_VERSION}
|
||||||
|
@ -167,7 +168,6 @@ configs:
|
||||||
name: ${STACK_NAME}_production_env_${PRODUCTION_ENV_VERSION}
|
name: ${STACK_NAME}_production_env_${PRODUCTION_ENV_VERSION}
|
||||||
file: production.rb.tmpl
|
file: production.rb.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
db_password:
|
db_password:
|
||||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
|
|
Reference in New Issue