forked from coop-cloud/traefik
Compare commits
4 Commits
feature/ir
...
master
Author | SHA1 | Date | |
---|---|---|---|
91ca64b71e | |||
8be9f387e5 | |||
85d0c159b0 | |||
6294944952 |
@ -34,7 +34,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
@ -147,3 +147,7 @@ COMPOSE_FILE="compose.yml"
|
|||||||
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
|
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
|
||||||
#WEB_ALT_ENABLED=1
|
#WEB_ALT_ENABLED=1
|
||||||
|
|
||||||
|
## Zulip
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.zulip.yml"
|
||||||
|
#ZULIP_HTTPS_PROXY_ENABLED=1
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "traefik:v2.11.10"
|
image: "traefik:v2.11.14"
|
||||||
# Note(decentral1se): *please do not* add any additional ports here.
|
# Note(decentral1se): *please do not* add any additional ports here.
|
||||||
# Doing so could break new installs with port conflicts. Please use
|
# Doing so could break new installs with port conflicts. Please use
|
||||||
# the usual `compose.$app.yml` approach for any additional ports
|
# the usual `compose.$app.yml` approach for any additional ports
|
||||||
@ -47,12 +47,12 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
|
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
|
||||||
- "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10"
|
- "coop-cloud.${STACK_NAME}.version=2.9.0+v2.11.14"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
|
|
||||||
socket-proxy:
|
socket-proxy:
|
||||||
image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26
|
image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
|
||||||
environment:
|
environment:
|
||||||
- ALLOW_START=0
|
- ALLOW_START=0
|
||||||
- ALLOW_STOP=0
|
- ALLOW_STOP=0
|
||||||
|
6
compose.zulip.yml
Normal file
6
compose.zulip.yml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- "traefik.http.services.${STACK_NAME}.loadBalancer.serversTransport=zulip@file"
|
@ -1,5 +1,10 @@
|
|||||||
---
|
---
|
||||||
http:
|
http:
|
||||||
|
{{ if eq (env "ZULIP_HTTPS_PROXY_ENABLED") "1" }}
|
||||||
|
serversTransports:
|
||||||
|
zulip:
|
||||||
|
insecureSkipVerify: true
|
||||||
|
{{ end }}
|
||||||
middlewares:
|
middlewares:
|
||||||
{{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
|
{{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
|
||||||
keycloak:
|
keycloak:
|
||||||
|
1
release/2.9.0+v2.11.14
Normal file
1
release/2.9.0+v2.11.14
Normal file
@ -0,0 +1 @@
|
|||||||
|
Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg
|
Loading…
x
Reference in New Issue
Block a user