Add version labels
continuous-integration/drone/push Build is passing Details

This commit is contained in:
3wc 2021-04-04 23:01:54 +02:00
parent 181730b058
commit 56ec3d0ee3
2 changed files with 13 additions and 20 deletions

View File

@ -1,8 +1,6 @@
---
version: '3.8' version: '3.8'
services: services:
app: app:
networks: networks:
- internal - internal
depends_on: depends_on:
@ -14,7 +12,6 @@ services:
- SELFOSS_DB_NAME=selfoss - SELFOSS_DB_NAME=selfoss
- SELFOSS_DB_USERNAME=selfoss - SELFOSS_DB_USERNAME=selfoss
- SELFOSS_DB_PASSWORD_FILE=/run/secrets/db_password - SELFOSS_DB_PASSWORD_FILE=/run/secrets/db_password
db: db:
image: "postgres:9.6.5" image: "postgres:9.6.5"
volumes: volumes:
@ -27,11 +24,12 @@ services:
POSTGRES_DB: selfoss POSTGRES_DB: selfoss
secrets: secrets:
- db_password - db_password
deploy:
labels:
- coop-cloud.${STACK_NAME}.db.version=9.6.5-2f2b1f4d
volumes: volumes:
postgres: postgres:
secrets: secrets:
db_password: db_password:
external: true external: true
name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION} name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}

View File

@ -1,6 +1,4 @@
---
version: '3.8' version: '3.8'
services: services:
app: app:
image: akito13/selfoss:0.2.0 image: akito13/selfoss:0.2.0
@ -19,8 +17,8 @@ services:
#- SELFOSS_WALLABAG_VERSION #- SELFOSS_WALLABAG_VERSION
- SELFOSS_SHARE - SELFOSS_SHARE
#secrets: #secrets:
# TODO 3wc: see above note about issue #3 # TODO 3wc: see above note about issue #3
#- selfoss_password #- selfoss_password
configs: configs:
- source: entrypoint_conf - source: entrypoint_conf
target: /docker-entrypoint.sh target: /docker-entrypoint.sh
@ -48,21 +46,18 @@ services:
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "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.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- coop-cloud.${STACK_NAME}.app.version=0.2.0-f93921cc
networks: networks:
proxy: proxy:
external: true external: true
internal: internal:
volumes: volumes:
selfoss: selfoss:
#secrets: #secrets:
# TODO 3wc: see above note about issue #3 # TODO 3wc: see above note about issue #3
#selfoss_password: #selfoss_password:
# external: true # external: true
# name: ${STACK_NAME}_selfoss_password_${SELFOSS_PASSWORD_VERSION} # name: ${STACK_NAME}_selfoss_password_${SELFOSS_PASSWORD_VERSION}
configs: configs:
entrypoint_conf: entrypoint_conf:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION} name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}