Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a12f64a21 | ||
|
|
32da5788e1 | ||
|
|
03383da087 | ||
|
|
24d6c375d6 | ||
|
|
f8ad0fa89c | ||
|
|
6ff53e80f3 | ||
|
|
d0e41c90fc | ||
|
|
31b3d9d499 | ||
|
|
f1613fa3af | ||
|
|
86d140593d | ||
|
|
b938f12631 | ||
|
|
bae14e2fcf | ||
|
|
9aed791981 | ||
|
|
3bc6ddd26d | ||
|
|
81dd25e1d1 | ||
|
|
dc4157583b | ||
|
|
b955925c5a | ||
|
|
8b314788e8 | ||
|
|
ce75f1204a | ||
|
|
3fb91f986f | ||
|
|
4be284c210 |
@@ -12,8 +12,11 @@ pull:
|
||||
for file in services/*; do docker-compose -f $$file pull; done
|
||||
export:
|
||||
7z a -p data.7z data
|
||||
import:
|
||||
7z x -p data.7z
|
||||
sign:
|
||||
gpg --encrypt --sign --recipient 'marc@marcpartensky.com' data.7z
|
||||
rm data.tgz
|
||||
# rm data.tgz
|
||||
networks:
|
||||
docker network create --driver overlay --attachable caddy || true
|
||||
docker network create --driver overlay --attachable ldap || true
|
||||
|
||||
+2
-12
@@ -9,17 +9,9 @@ services:
|
||||
environment:
|
||||
EXCLUDE_ENTERPRISE: "1"
|
||||
networks:
|
||||
- caddy
|
||||
- postgres
|
||||
deploy:
|
||||
labels:
|
||||
traefik.enable: "true"
|
||||
traefik.http.routers.focalboard.rule: >
|
||||
Host(`board.marcpartensky.com`) || Host(`board.marcpartensky.fr`)
|
||||
traefik.http.routers.focalboard.entrypoints: websecure
|
||||
# traefik.http.routers.focalboard.tls.certresolver: tls
|
||||
traefik.http.services.focalboard.loadbalancer.server.port: 8000
|
||||
# traefik.http.routers.focalboard.middlewares: ldap_auth
|
||||
ports:
|
||||
- "8000:8000"
|
||||
|
||||
volumes:
|
||||
data:
|
||||
@@ -27,5 +19,3 @@ volumes:
|
||||
networks:
|
||||
postgres:
|
||||
external: true
|
||||
caddy:
|
||||
external: true
|
||||
|
||||
+23
-18
@@ -5,30 +5,35 @@ services:
|
||||
image: nextcloud
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
# - nextcloud:/var/www/html
|
||||
- data:/var/www/html/data
|
||||
- config:/var/www/html/config
|
||||
- themes:/var/www/html/themes
|
||||
- apps:/var/www/html/custom_apps
|
||||
- /home/marc/srv/nextcloud:/var/www/html
|
||||
# - ../data/nextcloud/config:/var/www/html/config
|
||||
# - ../data/nextcloud/version.php:/var/www/html/version.php
|
||||
# - /srv/nextcloud/data:/var/www/html/data
|
||||
# - /srv/nextcloud/themes:/var/www/html/themes
|
||||
# - /srv/nextcloud/apps:/var/www/html/custom_apps
|
||||
# - ../data/nextcloud/test:/test
|
||||
#
|
||||
ports:
|
||||
- 8006:80
|
||||
|
||||
env_file:
|
||||
- ../data/secrets/nextcloud.env
|
||||
networks:
|
||||
- caddy
|
||||
# - caddy
|
||||
- postgres
|
||||
- ldap
|
||||
# - redis
|
||||
# - ldap
|
||||
# depends_on:
|
||||
# - nextcloud_mariadb
|
||||
deploy:
|
||||
labels:
|
||||
caddy: cloud.marcpartensky.com
|
||||
caddy.reverse_proxy: "{{upstreams http 80}}"
|
||||
traefik.enable: "true"
|
||||
traefik.http.routers.nextcloud.rule: >
|
||||
Host(`cloud.marcpartensky.com`) ||
|
||||
Host(`cloud.marcpartensky.fr`)
|
||||
traefik.http.routers.nextcloud.entrypoints: websecure
|
||||
traefik.http.routers.nextcloud.tls.certresolver: tls
|
||||
traefik.http.services.nextcloud.loadbalancer.server.port: 80
|
||||
# labels:
|
||||
# # caddy: cloud.marcpartensky.com
|
||||
# # caddy.reverse_proxy: "{{upstreams http 80}}"
|
||||
# traefik.enable: "true"
|
||||
# traefik.http.routers.nextcloud.rule: >
|
||||
# Host(`cloud.marcpartensky.com`)
|
||||
# traefik.http.routers.nextcloud.entrypoints: web
|
||||
# # traefik.http.routers.nextcloud.tls.certresolver: tls
|
||||
# traefik.http.services.nextcloud.loadbalancer.server.port: 80
|
||||
|
||||
volumes:
|
||||
data:
|
||||
|
||||
+17
-13
@@ -4,26 +4,30 @@ services:
|
||||
image: postgres:14
|
||||
restart: unless-stopped
|
||||
# user: postgres:postgres
|
||||
# user: "974:974"
|
||||
# user: "966:966"
|
||||
# user: 1000:1000
|
||||
ports:
|
||||
- target: 5432
|
||||
published: 5432
|
||||
mode: host
|
||||
networks:
|
||||
- postgres
|
||||
volumes:
|
||||
- postgres:/var/lib/postgresql/data
|
||||
- ../data/postgres/initdb.d:/initdb.d
|
||||
- ../data/postgres/certs:/var/lib/postgresql/certs
|
||||
- ../data/postgres:/docker-entrypoint-initdb.d
|
||||
- /home/marc/srv/postgres:/var/lib/postgresql/data
|
||||
# - ../data/postgres/server.crt:/var/lib/postgresql/server.crt
|
||||
# - ../data/postgres/server.key:/var/lib/postgresql/server.key
|
||||
env_file:
|
||||
- ../data/secrets/postgres.env
|
||||
command: |
|
||||
postgres
|
||||
-c log_statement=all
|
||||
-c log_destination=stderr
|
||||
-c ssl=on
|
||||
-c ssl_cert_file=/var/lib/postgresql/certs/server.crt
|
||||
-c ssl_key_file=/var/lib/postgresql/certs/server.key
|
||||
networks:
|
||||
- postgres
|
||||
# -c ssl=on
|
||||
# -c ssl_cert_file=/var/lib/postgresql/server.crt
|
||||
# -c ssl_key_file=/var/lib/postgresql/server.key
|
||||
# networks:
|
||||
# - postgres
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -q || exit 1"]
|
||||
interval: 10s
|
||||
@@ -47,8 +51,8 @@ services:
|
||||
image: kartoza/pg-backup:14-3.1
|
||||
env_file:
|
||||
- ../data/secrets/pg_backup.env
|
||||
networks:
|
||||
- postgres
|
||||
# networks:
|
||||
# - postgres
|
||||
volumes:
|
||||
- /srv/pg-backup:/backups
|
||||
|
||||
@@ -62,8 +66,8 @@ services:
|
||||
# - postgres
|
||||
# depends_on:
|
||||
# - postgres
|
||||
networks:
|
||||
- postgres
|
||||
# networks:
|
||||
# - postgres
|
||||
env_file:
|
||||
- ../data/secrets/pgbackups.env
|
||||
|
||||
|
||||
@@ -7,7 +7,11 @@ services:
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
networks:
|
||||
- caddy
|
||||
- caddy
|
||||
privileged: true
|
||||
# user: root
|
||||
environment:
|
||||
CATTLE_SYSTEM_CATALOG: bundled
|
||||
labels:
|
||||
caddy: rancher.marcpartensky.com
|
||||
caddy.reverse_proxy: "{{upstreams 8080}}"
|
||||
|
||||
+18
-43
@@ -1,60 +1,35 @@
|
||||
version: "3.9"
|
||||
|
||||
services:
|
||||
server:
|
||||
image: amruthpillai/reactive-resume:server-latest
|
||||
resume:
|
||||
image: amruthpillai/reactive-resume:latest
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- ../data/secrets/resume.env
|
||||
environment:
|
||||
PUBLIC_URL: https://cv.marcpartensky.fr
|
||||
PUBLIC_SERVER_URL: https://cv.marcpartensky.fr/api
|
||||
# environment:
|
||||
# PUBLIC_URL: https://cv.marcpartensky.com
|
||||
networks:
|
||||
- caddy
|
||||
- postgres
|
||||
deploy:
|
||||
labels:
|
||||
traefik.enable: "true"
|
||||
traefik.http.services.server.loadbalancer.server.port: 3100
|
||||
traefik.http.routers.server.rule: Host(`api.cv.marcpartensky.fr`)
|
||||
# traefik.http.routers.server.rule: "Host(`cv.marcpartensky.fr`) && PathPrefix(`/api`)"
|
||||
# traefik.http.routers.server.rule: >
|
||||
# Host(`cv.marcpartensky.com`) &&
|
||||
# PathPrefix(`/api`) ||
|
||||
# Host(`cv.marcpartensky.fr`) &&
|
||||
# PathPrefix(`/api`)
|
||||
traefik.http.routers.server.entrypoints: websecure
|
||||
# traefik.http.routers.server.tls.certresolver: cloudflare
|
||||
traefik.http.routers.server.tls.certresolver: tls
|
||||
- redis
|
||||
ports:
|
||||
- 8002:3000
|
||||
|
||||
client:
|
||||
image: amruthpillai/reactive-resume:client-latest
|
||||
printer:
|
||||
image: browserless/chrome:1.61.0-puppeteer-21.4.1
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- ../data/secrets/resume.env
|
||||
- ../data/secrets/resume.env
|
||||
ports:
|
||||
- 8003:3000
|
||||
environment:
|
||||
PUBLIC_URL: https://cv.marcpartensky.fr
|
||||
PUBLIC_SERVER_URL: https://cv.marcpartensky.fr/api
|
||||
networks:
|
||||
- caddy
|
||||
deploy:
|
||||
labels:
|
||||
traefik.enable: "true"
|
||||
traefik.http.services.client.loadbalancer.server.port: 3000
|
||||
# traefik.http.routers.client.rule: Host(`cv.marcpartensky.fr`)
|
||||
traefik.http.routers.client.rule: >
|
||||
Host(`cv.marcpartensky.fr`)
|
||||
# Host(`cv.marcpartensky.com`) &&
|
||||
# Path(`/`) ||
|
||||
# Host(`cv.marcpartensky.fr`) &&
|
||||
# Path(`/`)
|
||||
traefik.http.routers.client.entrypoints: websecure
|
||||
# traefik.http.routers.client.tls.certresolver: cloudflare
|
||||
traefik.http.routers.server.tls.certresolver: tls
|
||||
# traefik.http.routers.client.middlewares: ldap_auth
|
||||
# TOKEN: chrome_token
|
||||
EXIT_ON_HEALTH_FAILURE: true
|
||||
PRE_REQUEST_HEALTH_CHECK: true
|
||||
|
||||
networks:
|
||||
postgres:
|
||||
external: true
|
||||
caddy:
|
||||
external: true
|
||||
|
||||
redis:
|
||||
external: true
|
||||
|
||||
+13
-11
@@ -2,20 +2,22 @@ version: "3"
|
||||
|
||||
services:
|
||||
serge:
|
||||
image: ghcr.io/nsarrazin/serge:latest
|
||||
networks:
|
||||
- caddy
|
||||
# image: ghcr.io/nsarrazin/serge:latest
|
||||
image: ghcr.io/serge-chat/serge:latest
|
||||
# network_mode: host
|
||||
volumes:
|
||||
- weights:/usr/src/app/weights
|
||||
- data:/data/db/
|
||||
deploy:
|
||||
labels:
|
||||
traefik.enable: "true"
|
||||
traefik.http.routers.serge.rule: >
|
||||
Host(`serge.marcpartensky.fr`) ||
|
||||
Host(`serge.marcpartensky.com`)
|
||||
traefik.http.routers.serge.entrypoints: websecure
|
||||
traefik.http.services.serge.loadbalancer.server.port: 8008
|
||||
ports:
|
||||
- "8004:8008"
|
||||
# deploy:
|
||||
# labels:
|
||||
# traefik.enable: "true"
|
||||
# traefik.http.routers.serge.rule: >
|
||||
# Host(`serge.marcpartensky.fr`) ||
|
||||
# Host(`serge.marcpartensky.com`)
|
||||
# traefik.http.routers.serge.entrypoints: websecure
|
||||
# traefik.http.services.serge.loadbalancer.server.port: 8008
|
||||
|
||||
networks:
|
||||
caddy:
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
version: "3.9"
|
||||
services:
|
||||
syncthing:
|
||||
image: lscr.io/linuxserver/syncthing:latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
PUID: 1000
|
||||
PGID: 1000
|
||||
TZ: Etc/UTC
|
||||
volumes:
|
||||
- /path/to/appdata/config:/config
|
||||
- /path/to/data1:/data1
|
||||
- /path/to/data2:/data2
|
||||
ports:
|
||||
- 8384:8384
|
||||
- 22000:22000
|
||||
- 21027:21027/udp
|
||||
@@ -31,6 +31,8 @@ services:
|
||||
- caddy
|
||||
- vaultwarden
|
||||
- postgres
|
||||
ports:
|
||||
- "8001:80"
|
||||
# labels:
|
||||
# caddy: vault.marcpartensky.com
|
||||
# caddy.reverse_proxy: "{{upstreams 80}}"
|
||||
|
||||
@@ -14,6 +14,8 @@ services:
|
||||
webui:
|
||||
image: ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8004:3033"
|
||||
volumes:
|
||||
- ~/Videos/Youtube:/downloads
|
||||
networks:
|
||||
|
||||
Reference in New Issue
Block a user