Hacking away at this merge list syntax
continuous-integration/drone/push Build is failing Details

This commit is contained in:
decentral1se 2021-05-24 10:45:47 +02:00
parent f8a324c49c
commit d483f24fc5
No known key found for this signature in database
GPG Key ID: 92DAD76BD9567B8A
2 changed files with 49 additions and 49 deletions

View File

@ -6,11 +6,11 @@ services:
secrets:
- shared_lists_db_password
environment:
- ENABLE_SHARED_LISTS
- SHARED_LISTS_DB_NAME
- SHARED_LISTS_DB_TYPE
- SHARED_LISTS_HOST
- SHARED_LISTS_USER
ENABLE_SHARED_LISTS:
SHARED_LISTS_DB_NAME:
SHARED_LISTS_DB_TYPE:
SHARED_LISTS_HOST:
SHARED_LISTS_USER:
secrets:
shared_lists_db_password:

View File

@ -1,40 +1,40 @@
---
version: "3.8"
env: &env
- DOMAIN
- EMAIL_ERROR
- EMAIL_REPLY_DOMAIN
- EMAIL_SENDER
- FOODCOOP_CITY
- FOODCOOP_COUNTRY
- FOODCOOP_EMAIL
- FOODCOOP_FOOTER
- FOODCOOP_HELP_URL
- FOODCOOP_HOMEPAGE
- FOODCOOP_MULTI_INSTALL
- FOODCOOP_NAME
- FOODCOOP_PHONE
- FOODCOOP_STREET
- FOODCOOP_TIME_ZONE
- FOODCOOP_ZIP_CODE
- LOG_LEVEL
- MYSQL_DB=foodsoft
- MYSQL_HOST=db
- MYSQL_PORT=3306
- MYSQL_USER=foodsoft
- QUEUE=foodsoft_notifier
- REDIS_URL=redis://cache:6379
- SECRET_KEY_BASE_FILE=/run/secrets/secret_key_base
- SMTP_ADDRESS
- SMTP_AUTHENTICATION
- SMTP_DOMAIN
- SMTP_ENABLE_STARTTLS_AUTO
- SMTP_PASSWORD_FILE=/run/secrets/smtp_password
- SMTP_PORT
- SMTP_USER_NAME
x-env: &env
DOMAIN:
EMAIL_ERROR:
EMAIL_REPLY_DOMAIN:
EMAIL_SENDER:
FOODCOOP_CITY:
FOODCOOP_COUNTRY:
FOODCOOP_EMAIL:
FOODCOOP_FOOTER:
FOODCOOP_HELP_URL:
FOODCOOP_HOMEPAGE:
FOODCOOP_MULTI_INSTALL:
FOODCOOP_NAME:
FOODCOOP_PHONE:
FOODCOOP_STREET:
FOODCOOP_TIME_ZONE:
FOODCOOP_ZIP_CODE:
LOG_LEVEL:
MYSQL_DB: foodsoft
MYSQL_HOST: db
MYSQL_PORT: 3306
MYSQL_USER: foodsoft
QUEUE: foodsoft_notifier
REDIS_URL: redis://cache:6379
SECRET_KEY_BASE_FILE: /run/secrets/secret_key_base
SMTP_ADDRESS:
SMTP_AUTHENTICATION:
SMTP_DOMAIN:
SMTP_ENABLE_STARTTLS_AUTO:
SMTP_PASSWORD_FILE: /run/secrets/smtp_password
SMTP_PORT:
SMTP_USER_NAME:
configs: &configs
x-configs: &configs
- source: app_config
target: /usr/src/app/config/app_config.yml
- source: db_config
@ -45,7 +45,7 @@ configs: &configs
target: /usr/src/app/docker-entrypoint.sh
mode: 0555
secrets: &secrets
x-secrets: &secrets
- db_password
- secret_key_base
- smtp_password
@ -61,7 +61,7 @@ services:
entrypoint: &entrypoint /usr/src/app/docker-entrypoint.sh
environment:
<<: *env
- FOODSOFT_SERVICE=app
FOODSOFT_SERVICE: app
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000"]
interval: 15s
@ -83,7 +83,7 @@ services:
image: *image
environment:
<<: *env
- FOODSOFT_SERVICE=cron
FOODSOFT_SERVICE: cron
configs: *configs
entrypoint: *entrypoint
secrets: *secrets
@ -94,7 +94,7 @@ services:
image: *image
environment:
<<: *env
- FOODSOFT_SERVICE=worker
FOODSOFT_SERVICE: worker
configs: *configs
entrypoint: *entrypoint
secrets:
@ -110,9 +110,9 @@ services:
secrets: *secrets
environment:
<<: *env
- FOODSOFT_SERVICE=smtp
- SMTP_SERVER_HOST
- SMTP_SERVER_PORT
FOODSOFT_SERVICE: smtp
SMTP_SERVER_HOST:
SMTP_SERVER_PORT:
networks:
- proxy
- internal
@ -127,10 +127,10 @@ services:
image: "mariadb:10.6"
command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci"
environment:
- MYSQL_USER=foodsoft
- MYSQL_DATABASE=foodsoft
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
MYSQL_USER: foodsoft
MYSQL_DATABASE: foodsoft
MYSQL_PASSWORD_FILE: /run/secrets/db_password
MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password
secrets:
- db_password
- db_root_password