From 56ec3d0ee39a276859ad6ea56235939856f8438e Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sun, 4 Apr 2021 23:01:54 +0200 Subject: [PATCH] Add version labels --- compose.postgres.yml | 14 ++++++-------- compose.yml | 19 +++++++------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/compose.postgres.yml b/compose.postgres.yml index cbd0da7..805ec9b 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -1,8 +1,6 @@ ---- version: '3.8' - services: - app: + app: networks: - internal depends_on: @@ -14,7 +12,6 @@ services: - SELFOSS_DB_NAME=selfoss - SELFOSS_DB_USERNAME=selfoss - SELFOSS_DB_PASSWORD_FILE=/run/secrets/db_password - db: image: "postgres:9.6.5" volumes: @@ -27,11 +24,12 @@ services: POSTGRES_DB: selfoss secrets: - db_password - + deploy: + labels: + - coop-cloud.${STACK_NAME}.db.version=9.6.5-2f2b1f4d volumes: postgres: - secrets: - db_password: - external: true + db_password: + external: true name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION} diff --git a/compose.yml b/compose.yml index 41d3d58..289f9b3 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,4 @@ ---- version: '3.8' - services: app: image: akito13/selfoss:0.2.0 @@ -19,8 +17,8 @@ services: #- SELFOSS_WALLABAG_VERSION - SELFOSS_SHARE #secrets: - # TODO 3wc: see above note about issue #3 - #- selfoss_password + # TODO 3wc: see above note about issue #3 + #- selfoss_password configs: - source: entrypoint_conf target: /docker-entrypoint.sh @@ -48,21 +46,18 @@ 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}.app.version=0.2.0-f93921cc networks: proxy: external: true internal: - volumes: selfoss: - #secrets: - # TODO 3wc: see above note about issue #3 - #selfoss_password: - # external: true - # name: ${STACK_NAME}_selfoss_password_${SELFOSS_PASSWORD_VERSION} - +# TODO 3wc: see above note about issue #3 +#selfoss_password: +# external: true +# name: ${STACK_NAME}_selfoss_password_${SELFOSS_PASSWORD_VERSION} configs: entrypoint_conf: name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}