generated from coop-cloud/example
Compare commits
No commits in common. "88c34e94870a6d559f9272c9cdc5953c767a76ef" and "a0f45fd486f7188c3daa6ce3d8796272de3291b2" have entirely different histories.
88c34e9487
...
a0f45fd486
11
compose.yml
11
compose.yml
|
@ -1,7 +1,7 @@
|
|||
version: "3.8"
|
||||
services:
|
||||
app:
|
||||
image: wallabag/wallabag:2.6.8
|
||||
image: wallabag/wallabag:2.6.1
|
||||
environment:
|
||||
# Prevent database creation (handled by MySQL service)
|
||||
- POPULATE_DATABASE="false"
|
||||
|
@ -16,7 +16,7 @@ services:
|
|||
- SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
|
||||
- SYMFONY__ENV__MAILER_HOST
|
||||
- SYMFONY__ENV__MAILER_USER
|
||||
- SYMFONY__ENV__MAILER_PASSWORD_FILE=/run/secrets/smtp_password
|
||||
- SYMFONY__ENV__MAILER_PASSWORD=/run/secrets/smtp_password
|
||||
- SYMFONY__ENV__FROM_EMAIL
|
||||
- SYMFONY__ENV__DOMAIN_NAME=https://${DOMAIN}
|
||||
- SYMFONY__ENV__FOSUSER_REGISTRATION
|
||||
|
@ -28,6 +28,7 @@ services:
|
|||
- internal
|
||||
secrets:
|
||||
- db_password
|
||||
#- admin_password
|
||||
- app_secret
|
||||
- smtp_password
|
||||
entrypoint: /custom-entrypoint.sh
|
||||
|
@ -48,9 +49,9 @@ services:
|
|||
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.5.2+2.6.8"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.5.0+2.6.1"
|
||||
db:
|
||||
image: mariadb:11.2
|
||||
image: mariadb:10.11
|
||||
environment:
|
||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||
- MYSQL_USER=wallabag
|
||||
|
@ -64,7 +65,7 @@ services:
|
|||
- db_password
|
||||
- db_root_password
|
||||
redis:
|
||||
image: redis:7.2.4-alpine
|
||||
image: redis:7.0.11-alpine
|
||||
networks:
|
||||
- internal
|
||||
volumes:
|
||||
|
|
|
@ -1,9 +1,31 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
export SYMFONY__ENV__DATABASE_PASSWORD=$(cat $SYMFONY__ENV__DATABASE_PASSWORD_FILE)
|
||||
export SYMFONY__ENV__SECRET=$(cat $SYMFONY__ENV__SECRET_FILE)
|
||||
set -eu
|
||||
|
||||
export SYMFONY__ENV__MAILER_DSN=smtp://${SYMFONY__ENV__MAILER_USER}:$(cat ${SYMFONY__ENV__MAILER_PASSWORD_FILE})@${SYMFONY__ENV__MAILER_HOST}:465
|
||||
file_env() {
|
||||
local var="$1"
|
||||
local fileVar="${var}_FILE"
|
||||
local def="${2:-}"
|
||||
|
||||
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local val="$def"
|
||||
|
||||
if [ "${!var:-}" ]; then
|
||||
val="${!var}"
|
||||
elif [ "${!fileVar:-}" ]; then
|
||||
val="$(< "${!fileVar}")"
|
||||
fi
|
||||
|
||||
export "$var"="$val"
|
||||
unset "$fileVar"
|
||||
}
|
||||
|
||||
file_env "SYMFONY__ENV__DATABASE_PASSWORD"
|
||||
file_env "SYMFONY__ENV__SECRET"
|
||||
|
||||
# https://github.com/wallabag/docker/blob/master/root/entrypoint.sh
|
||||
sh -c "/entrypoint.sh migrate"
|
||||
|
|
Loading…
Reference in New Issue