Compare commits
35 Commits
renovate/d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 738905f6dd | |||
| 39785d6661 | |||
| ba89e1730d | |||
| a345736d3c | |||
| 303e9fc542 | |||
| 7f68ebfd85 | |||
| 23cefa5b75 | |||
| dc7d886f57 | |||
| 932f931eb0 | |||
| f4e8aefb63 | |||
| 4e7e7a7f09 | |||
| 8b5e3e10bd | |||
| 60406eaf34 | |||
| b63a8b9171 | |||
| ce7f566374 | |||
| 53822439a0 | |||
| a8fbd55566 | |||
| 407956f095 | |||
| eabe7158ce | |||
| 32d6f70d0a | |||
| e7ce0a338a | |||
| 22e8845ddb | |||
| b69a89cc79 | |||
| 768cd85c67 | |||
| 23059ba9db | |||
|
|
68e658599b | ||
|
|
a51efe581b | ||
|
|
fb2d65e38b | ||
|
|
84216da14e | ||
|
|
6d4e0d523d | ||
|
|
1b4146eb84 | ||
|
|
88f534fe0c | ||
|
|
68ebb0a8b3 | ||
|
|
6766167fd9 | ||
|
|
799364580a |
@ -4,7 +4,7 @@ services:
|
|||||||
traefik:
|
traefik:
|
||||||
container_name: traefik
|
container_name: traefik
|
||||||
# The official v2 Traefik docker image
|
# The official v2 Traefik docker image
|
||||||
image: traefik:v3.1
|
image: traefik:v3.4
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- crowdsec
|
- crowdsec
|
||||||
@ -25,6 +25,7 @@ services:
|
|||||||
- --experimental.plugins.crowdsec-bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin
|
- --experimental.plugins.crowdsec-bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin
|
||||||
- --experimental.plugins.crowdsec-bouncer.version=v1.2.1
|
- --experimental.plugins.crowdsec-bouncer.version=v1.2.1
|
||||||
# - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
|
# - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
|
||||||
|
- --accesslog=true
|
||||||
ports:
|
ports:
|
||||||
# The HTTP port
|
# The HTTP port
|
||||||
- "80:80"
|
- "80:80"
|
||||||
@ -71,7 +72,7 @@ services:
|
|||||||
# Schedule: "*/5 * * * *" #optional
|
# Schedule: "*/5 * * * *" #optional
|
||||||
# TZ: Canada/Eastern #optional
|
# TZ: Canada/Eastern #optional
|
||||||
dokuwiki:
|
dokuwiki:
|
||||||
image: bitnami/dokuwiki:20240206
|
image: linuxserver/dokuwiki:version-2025-05-14a
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
container_name: dokuwiki
|
container_name: dokuwiki
|
||||||
ports:
|
ports:
|
||||||
@ -89,7 +90,7 @@ services:
|
|||||||
- "traefik.http.routers.dokuwiki.entrypoints=websecure"
|
- "traefik.http.routers.dokuwiki.entrypoints=websecure"
|
||||||
- "traefik.http.routers.dokuwiki.tls.certresolver=myresolver"
|
- "traefik.http.routers.dokuwiki.tls.certresolver=myresolver"
|
||||||
- traefik.http.routers.dokuwiki.tls=true
|
- traefik.http.routers.dokuwiki.tls=true
|
||||||
- "traefik.http.routers.dokuwiki.middlewares=crowdsec@docker"
|
#- "traefik.http.routers.dokuwiki.middlewares=crowdsec@docker"
|
||||||
mail-server:
|
mail-server:
|
||||||
tty: true
|
tty: true
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
@ -106,7 +107,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./stalwart-mail:/opt/stalwart-mail
|
- ./stalwart-mail:/opt/stalwart-mail
|
||||||
container_name: stalwart-mail
|
container_name: stalwart-mail
|
||||||
image: stalwartlabs/mail-server:v0.10.6
|
image: stalwartlabs/mail-server:v0.11.6
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.stalwart.rule=Host(`stalwart.mycomputer.party`)"
|
- "traefik.http.routers.stalwart.rule=Host(`stalwart.mycomputer.party`)"
|
||||||
@ -179,7 +180,7 @@ services:
|
|||||||
timeout: 3s
|
timeout: 3s
|
||||||
authentik-server:
|
authentik-server:
|
||||||
container_name: authentik-server
|
container_name: authentik-server
|
||||||
image: ghcr.io/goauthentik/server:2025.2.2
|
image: ghcr.io/goauthentik/server:2025.6.2
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: server
|
command: server
|
||||||
environment:
|
environment:
|
||||||
@ -213,7 +214,7 @@ services:
|
|||||||
- "traefik.http.routers.authentik.middlewares=crowdsec@docker"
|
- "traefik.http.routers.authentik.middlewares=crowdsec@docker"
|
||||||
authentik-worker:
|
authentik-worker:
|
||||||
container_name: authentik-worker
|
container_name: authentik-worker
|
||||||
image: ghcr.io/goauthentik/server:2025.2.2
|
image: ghcr.io/goauthentik/server:2025.6.2
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: worker
|
command: worker
|
||||||
environment:
|
environment:
|
||||||
@ -239,7 +240,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
changedetection:
|
changedetection:
|
||||||
image: ghcr.io/dgtlmoon/changedetection.io:0.47.06
|
image: ghcr.io/dgtlmoon/changedetection.io:0.49.7
|
||||||
container_name: changedetection
|
container_name: changedetection
|
||||||
hostname: changedetection
|
hostname: changedetection
|
||||||
volumes:
|
volumes:
|
||||||
@ -371,7 +372,7 @@ services:
|
|||||||
- "traefik.http.services.healthchecks-http.loadbalancer.server.port=8000"
|
- "traefik.http.services.healthchecks-http.loadbalancer.server.port=8000"
|
||||||
- "traefik.http.routers.healthchecks.middlewares=authchain@docker"
|
- "traefik.http.routers.healthchecks.middlewares=authchain@docker"
|
||||||
apache:
|
apache:
|
||||||
image: php:7.2-apache
|
image: php:8.4-apache
|
||||||
volumes:
|
volumes:
|
||||||
- ./apache:/var/www/html
|
- ./apache:/var/www/html
|
||||||
ports:
|
ports:
|
||||||
@ -388,7 +389,7 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
apache2:
|
apache2:
|
||||||
image: php:7.2-apache
|
image: php:8.4-apache
|
||||||
volumes:
|
volumes:
|
||||||
- ./apache:/var/www/html
|
- ./apache:/var/www/html
|
||||||
ports:
|
ports:
|
||||||
@ -404,6 +405,23 @@ services:
|
|||||||
# - traefik.http.routers.apache2.middlewares=authchain@docker
|
# - traefik.http.routers.apache2.middlewares=authchain@docker
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
|
cocktails:
|
||||||
|
image: php:8.4-apache
|
||||||
|
volumes:
|
||||||
|
- ./cocktails_static:/var/www/html
|
||||||
|
ports:
|
||||||
|
- 8017:80
|
||||||
|
container_name: cocktails
|
||||||
|
labels:
|
||||||
|
- "traefik.enable=true"
|
||||||
|
- "traefik.http.routers.cocktails.rule=Host(`cocktails.mycomputer.party`)"
|
||||||
|
- "traefik.http.routers.cocktails.entrypoints=websecure"
|
||||||
|
- "traefik.http.routers.cocktails.tls.certresolver=myresolver"
|
||||||
|
- "traefik.http.routers.cocktails.tls=true"
|
||||||
|
- "traefik.http.services.cocktails-http.loadbalancer.server.port=80"
|
||||||
|
# - traefik.http.routers.cocktails.middlewares=authchain@docker
|
||||||
|
networks:
|
||||||
|
- backend
|
||||||
|
|
||||||
# wireguard:
|
# wireguard:
|
||||||
# image: lscr.io/linuxserver/wireguard
|
# image: lscr.io/linuxserver/wireguard
|
||||||
@ -428,7 +446,7 @@ services:
|
|||||||
# - net.ipv4.conf.all.src_valid_mark=1
|
# - net.ipv4.conf.all.src_valid_mark=1
|
||||||
# restart: unless-stopped
|
# restart: unless-stopped
|
||||||
crowdsec:
|
crowdsec:
|
||||||
image: crowdsecurity/crowdsec:v1.6.3
|
image: crowdsecurity/crowdsec:v1.6.9
|
||||||
container_name: crowdsec
|
container_name: crowdsec
|
||||||
environment:
|
environment:
|
||||||
PGID: "1001"
|
PGID: "1001"
|
||||||
@ -455,7 +473,7 @@ services:
|
|||||||
- proxy
|
- proxy
|
||||||
- backend
|
- backend
|
||||||
ddns-updater:
|
ddns-updater:
|
||||||
image: docker.io/qmcgaw/ddns-updater:v2.8
|
image: docker.io/qmcgaw/ddns-updater:v2.9
|
||||||
container_name: ddns-updater
|
container_name: ddns-updater
|
||||||
ports:
|
ports:
|
||||||
- 8014:8000
|
- 8014:8000
|
||||||
@ -504,7 +522,7 @@ services:
|
|||||||
- ./bookstack_db_data:/config
|
- ./bookstack_db_data:/config
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
wikijs:
|
wikijs:
|
||||||
image: ghcr.io/requarks/wiki:2.5.305
|
image: ghcr.io/requarks/wiki:2.5.307
|
||||||
container_name: wikijs
|
container_name: wikijs
|
||||||
environment:
|
environment:
|
||||||
DB_TYPE: postgres
|
DB_TYPE: postgres
|
||||||
@ -533,21 +551,22 @@ services:
|
|||||||
- traefik.http.routers.plik.tls=true
|
- traefik.http.routers.plik.tls=true
|
||||||
- "traefik.http.routers.plik.entrypoints=websecure"
|
- "traefik.http.routers.plik.entrypoints=websecure"
|
||||||
- "traefik.http.routers.plik.tls.certresolver=myresolver"
|
- "traefik.http.routers.plik.tls.certresolver=myresolver"
|
||||||
cmg:
|
#cmg:
|
||||||
image: gitea.mycomputer.party/justus/cmg:latest
|
# image: gitea.mycomputer.party/justus/cmg:latest
|
||||||
container_name: cmg
|
# container_name: cmg
|
||||||
volumes:
|
# volumes:
|
||||||
- ./cmg/static:/usr/local/app/static
|
# - ./cmg/static:/usr/local/app/static
|
||||||
- ./cmg/templates:/usr/local/app/templates
|
# - ./cmg/templates:/usr/local/app/templates
|
||||||
- ./cmg/menu:/usr/local/app/menu
|
# - ./cmg/menu:/usr/local/app/menu
|
||||||
ports:
|
# ports:
|
||||||
- 8016:5000
|
# - 8016:5000
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
labels:
|
# labels:
|
||||||
- "traefik.http.routers.cmg.rule=Host(`cocktailmenu.mycomputer.party`)"
|
# - "traefik.http.routers.cmg.rule=Host(`cocktailmenu.mycomputer.party`)"
|
||||||
- traefik.http.routers.cmg.tls=true
|
# - traefik.http.routers.cmg.tls=true
|
||||||
- "traefik.http.routers.cmg.entrypoints=websecure"
|
# - "traefik.http.routers.cmg.entrypoints=websecure"
|
||||||
- "traefik.http.routers.cmg.tls.certresolver=myresolver"
|
# - "traefik.http.routers.cmg.tls.certresolver=myresolver"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -3,8 +3,9 @@ services:
|
|||||||
traefik:
|
traefik:
|
||||||
container_name: traefik
|
container_name: traefik
|
||||||
# The official v2 Traefik docker image
|
# The official v2 Traefik docker image
|
||||||
image: traefik:v2.11
|
image: traefik:v3.4
|
||||||
# Enables the web UI and tells Traefik to listen to docker
|
# Enables the web UI and tells Traefik to listen to docker
|
||||||
|
restart: unless-stopped
|
||||||
command:
|
command:
|
||||||
- --api.insecure=true
|
- --api.insecure=true
|
||||||
- --providers.docker
|
- --providers.docker
|
||||||
@ -59,7 +60,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
paperless-webserver:
|
paperless-webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:2.13.5
|
image: ghcr.io/paperless-ngx/paperless-ngx:2.16.3
|
||||||
container_name: paperless-webserver
|
container_name: paperless-webserver
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -72,8 +73,9 @@ services:
|
|||||||
- media:/usr/src/paperless/media
|
- media:/usr/src/paperless/media
|
||||||
- export:/usr/src/paperless/export
|
- export:/usr/src/paperless/export
|
||||||
- consume:/usr/src/paperless/consume
|
- consume:/usr/src/paperless/consume
|
||||||
env_file: docker-compose.env
|
#env_file: docker-compose.env
|
||||||
# environment:
|
environment:
|
||||||
|
PAPERLESS_DATE_ORDER: MDY
|
||||||
labels:
|
labels:
|
||||||
- "traefik.http.routers.paperless.rule=Host(`paperless.injust.us`)"
|
- "traefik.http.routers.paperless.rule=Host(`paperless.injust.us`)"
|
||||||
- "traefik.http.routers.paperless.entrypoints=websecure"
|
- "traefik.http.routers.paperless.entrypoints=websecure"
|
||||||
@ -159,7 +161,7 @@ services:
|
|||||||
|
|
||||||
redis:
|
redis:
|
||||||
container_name: immich_redis
|
container_name: immich_redis
|
||||||
image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
|
image: docker.io/redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: redis-cli ping || exit 1
|
test: redis-cli ping || exit 1
|
||||||
restart: always
|
restart: always
|
||||||
|
|||||||
@ -11,7 +11,7 @@ volumes:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: gitea/gitea:1.22.3
|
image: gitea/gitea:1.23.5
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@ -21,9 +21,9 @@ docker:
|
|||||||
gitea:
|
gitea:
|
||||||
ansible_ssh_user: root
|
ansible_ssh_user: root
|
||||||
|
|
||||||
wireguard:
|
#wireguard:
|
||||||
hosts:
|
# hosts:
|
||||||
wireguard:
|
# wireguard:
|
||||||
|
|
||||||
external_access:
|
external_access:
|
||||||
hosts:
|
hosts:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user