Compare commits

..
2 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ services:
git: git:
environment: environment:
- GIT_REPO_URL - GIT_REPO_URL
image: alpine/git:v2.54.0 image: alpine/git:v2.49.1
entrypoint: /docker-entrypoint.sh entrypoint: /docker-entrypoint.sh
volumes: volumes:
- content:/git - content:/git
+6 -6
View File
@@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: nginx:1.31.3 image: nginx:1.29.0
networks: networks:
- proxy - proxy
deploy: deploy:
@@ -15,13 +15,13 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
# Force HTTPS (redirect http -> https) on DOMAIN and any EXTRA_DOMAINS # Redirect from EXTRA_DOMAINS to DOMAIN
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=1.13.1+1.31.3" - "coop-cloud.${STACK_NAME}.version=1.11.0+1.29.0"
- "backupbot.backup=true" - "backupbot.backup=true"
- "backupbot.backup.path=/usr/share/nginx/html" - "backupbot.backup.path=/nonexistent-path-cc-ci-canary-bad"
environment: environment:
- DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf - DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf
- REDIRECT_FROM_PATH - REDIRECT_FROM_PATH