Compare commits

...

6 Commits

Author SHA1 Message Date
ca989e903c chore: publish 2.7.0+v2.11.8 release 2024-08-07 16:08:18 +02:00
50cdb20a39 docker soket via socket proxy (#48)
Mounting the the docker socket directly is not recommended, because it is a security issue. Instead access it via a tcp socket proxy.

See https://doc.traefik.io/traefik/providers/docker/#docker-api-access

Reviewed-on: coop-cloud/traefik#48
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
Co-authored-by: p4u1 <p4u1_f4u1@riseup.net>
Co-committed-by: p4u1 <p4u1_f4u1@riseup.net>
2024-07-06 18:28:26 +00:00
60b79b447a add alakazam matrix federation integration 2024-06-04 15:22:25 +02:00
f1b52916df Merge pull request 'fix: the command is "secret"' (#47) from fauno/traefik:master into master
Reviewed-on: coop-cloud/traefik#47
2024-06-01 20:07:19 +00:00
f
35d435b4f6 fix: the command is "secret" 2024-06-01 13:54:50 -03:00
b7ea50d6aa chore: publish 2.6.3+v2.11.2 release 2024-04-14 21:38:48 +01:00
5 changed files with 47 additions and 7 deletions

View File

@ -57,8 +57,8 @@ COMPOSE_FILE="compose.yml"
# Set wildcards = 1, and uncomment compose_file to enable. # Set wildcards = 1, and uncomment compose_file to enable.
# Create your certs elsewhere and add them like: # Create your certs elsewhere and add them like:
# abra app secrets insert {myapp.example.coop} ssl_cert v1 "$(cat /path/to/fullchain.pem)" # abra app secret insert {myapp.example.coop} ssl_cert v1 "$(cat /path/to/fullchain.pem)"
# abra app secrets insert {myapp.example.coop} ssl_key v1 "$(cat /path/to/privkey.pem)" # abra app secret insert {myapp.example.coop} ssl_key v1 "$(cat /path/to/privkey.pem)"
#WILDCARDS_ENABLED=1 #WILDCARDS_ENABLED=1
#SECRET_WILDCARD_CERT_VERSION=v1 #SECRET_WILDCARD_CERT_VERSION=v1
#SECRET_WILDCARD_KEY_VERSION=v1 #SECRET_WILDCARD_KEY_VERSION=v1

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v20 export TRAEFIK_YML_VERSION=v21
export FILE_PROVIDER_YML_VERSION=v10 export FILE_PROVIDER_YML_VERSION=v10
export ENTRYPOINT_VERSION=v3 export ENTRYPOINT_VERSION=v3

4
alaconnect.yml Normal file
View File

@ -0,0 +1,4 @@
matrix-synapse:
uncomment:
- compose.matrix.yml
- MATRIX_FEDERATION_ENABLED

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "traefik:v2.11.1" image: "traefik:v2.11.8"
# 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
@ -11,7 +11,6 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
- "letsencrypt:/etc/letsencrypt" - "letsencrypt:/etc/letsencrypt"
- "file-providers:/etc/traefik/file-providers" - "file-providers:/etc/traefik/file-providers"
configs: configs:
@ -24,6 +23,7 @@ services:
mode: 0555 mode: 0555
networks: networks:
- proxy - proxy
- internal
environment: environment:
- DASHBOARD_ENABLED - DASHBOARD_ENABLED
- LOG_LEVEL - LOG_LEVEL
@ -47,12 +47,48 @@ 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.6.2+v2.11.1" - "coop-cloud.${STACK_NAME}.version=2.7.0+v2.11.8"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
socket-proxy:
image: lscr.io/linuxserver/socket-proxy:1.26.1-r0-ls15
environment:
- ALLOW_START=0
- ALLOW_STOP=0
- ALLOW_RESTARTS=0
- AUTH=0
- BUILD=0
- COMMIT=0
- CONFIGS=0
- CONTAINERS=1 # Needs access
- DISABLE_IPV6=0
- DISTRIBUTION=0
- EVENTS=1 # Needs access
- EXEC=0
- IMAGES=0
- INFO=0
- NETWORKS=1 # Needs access
- NODES=0
- PING=0
- POST=0
- PLUGINS=0
- SECRETS=0
- SERVICES=1 # Needs access
- SESSION=0
- SWARM=0
- SYSTEM=0
- TASKS=1 # Needs access
- VERSION=1 # Needs access
- VOLUMES=0
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
networks:
- internal
networks: networks:
proxy: proxy:
external: true external: true
internal:
configs: configs:
traefik_yml: traefik_yml:

View File

@ -4,7 +4,7 @@ log:
providers: providers:
docker: docker:
endpoint: "unix:///var/run/docker.sock" endpoint: "tcp://socket-proxy:2375"
exposedByDefault: false exposedByDefault: false
network: proxy network: proxy
swarmMode: true swarmMode: true