Latest updates after Silverblue; add WikiJS OpenID

This commit is contained in:
2022-05-14 18:00:02 +03:00
parent 185563ca05
commit 84d49a6672
2 changed files with 17 additions and 10 deletions

View File

@@ -5,6 +5,7 @@ services:
traefik:
image: "traefik:v2.6"
container_name: "traefik"
privileged: true
command:
- "--log.level=DEBUG"
- "--api.insecure=true"
@@ -19,6 +20,10 @@ services:
- "--certificatesresolvers.pukekoresolver.acme.email=matanhorovitz@protonmail.com"
- "--certificatesresolvers.pukekoresolver.acme.storage=/letsencrypt/acme.json"
- "--certificatesresolvers.pukekoresolver.acme.dnschallenge.resolvers=1.1.1.1:53"
# Proxy to local Cockpit server
# - "--providers.file=true"
# - "--providers.file.directory=./config/cockpit.yml"
# - "--providers.file.watch=true"
ports:
- "80:80"
- "443:443"
@@ -28,8 +33,8 @@ services:
- CF_API_EMAIL=matanhorovitz@protonmail.com
- CF_DNS_API_TOKEN=0dFNYA8qtzVhVtGi4nEb7_aclTOdGthYm5Q7N05n
volumes:
- "./letsencrypt:/letsencrypt"
- "/var/run/docker.sock:/var/run/docker.sock:ro"
- "./letsencrypt:/letsencrypt:z"
- "/var/run/docker.sock:/var/run/docker.sock:z"
networks:
- network
- internal
@@ -44,6 +49,7 @@ services:
- jekyll_network
- jellyfin_network
- joplin_network
- paperless-ngx_network
- photoprism_network
- podgrab_network
- portainer_network
@@ -51,7 +57,6 @@ services:
- qbittorrent_network
- syncthing_network
- wikijs_network
- wireguard_network
restart: unless-stopped
labels:
- "traefik.enable=true"
@@ -67,7 +72,7 @@ services:
image: b4bz/homer
container_name: homer
volumes:
- ./homer/:/www/assets
- ./homer/:/www/assets:z
ports:
- 4957:8080
environment:
@@ -90,7 +95,7 @@ services:
- TZ=Asia/Jerusalem
- AUTHELIA_IDENTITY_PROVIDERS_OIDC_ISSUER_PRIVATE_KEY_FILE=/run/secrets/private_key
volumes:
- ./authelia:/config
- ./authelia:/config:z
restart: unless-stopped
secrets:
- hmac
@@ -140,6 +145,8 @@ networks:
external: true
joplin_network:
external: true
paperless-ngx_network:
external: true
photoprism_network:
external: true
podgrab_network:
@@ -154,8 +161,6 @@ networks:
external: true
wikijs_network:
external: true
wireguard_network:
external: true
qbittorrent_network:
external: true
syncthing_network: