From 5dc60449060ead87eeea351c9383b650c03f8bc3 Mon Sep 17 00:00:00 2001 From: faulty Date: Wed, 1 Mar 2023 15:17:10 +0100 Subject: [PATCH] changes --- docker-compose.base.yml | 6 ++++-- docker-compose.cloud.yml | 4 ++++ docker-compose.core.yml | 2 ++ docker-compose.devops.yml | 9 +++++---- docker-compose.games.yml | 9 ++++++++- docker-compose.media.yml | 27 --------------------------- docker-compose.utils.yml | 12 +++++++++--- docker-compose.web.yml | 8 ++++++-- 8 files changed, 38 insertions(+), 39 deletions(-) diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 617f41d..269a288 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -1,9 +1,10 @@ version: '2.2' networks: - internal: proxy: external: true + internal: + external: true x-common: &common restart: always @@ -18,7 +19,8 @@ x-common: &common - /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro networks: - proxy: + - proxy + - internal services: proxy: diff --git a/docker-compose.cloud.yml b/docker-compose.cloud.yml index 36326c5..3cb1bb8 100644 --- a/docker-compose.cloud.yml +++ b/docker-compose.cloud.yml @@ -1,5 +1,8 @@ version: '2.2' +networks: + cloud: + services: cryptpad: build: @@ -26,3 +29,4 @@ services: hard: 1000000 networks: - proxy + - cloud diff --git a/docker-compose.core.yml b/docker-compose.core.yml index 1a4f63f..72b4d35 100644 --- a/docker-compose.core.yml +++ b/docker-compose.core.yml @@ -11,6 +11,8 @@ services: - /srv/gatus/data:/data networks: - proxy + - minecraft + - cloud - internal ntfy: diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index 1948277..8513007 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -2,8 +2,9 @@ version: '2.2' services: gitea: - privileged: true image: gitea/gitea:latest + restart: always + privileged: true environment: - USER_UID=1000 - USER_GID=1002 @@ -11,9 +12,6 @@ services: - LETSENCRYPT_HOST=gitea.faulty.nl - VIRTUAL_HOST=gitea.faulty.nl - VIRTUAL_PORT=3000 - restart: always - networks: - - proxy volumes: - /srv/gitea/data:/data/git - /srv/gitea/config:/data/gitea @@ -22,6 +20,9 @@ services: - /etc/localtime:/etc/localtime:ro ports: - "2222:22" + networks: + - proxy + - internal gitlab: image: gitlab/gitlab-ce:latest diff --git a/docker-compose.games.yml b/docker-compose.games.yml index f6e43f9..5796062 100644 --- a/docker-compose.games.yml +++ b/docker-compose.games.yml @@ -11,6 +11,7 @@ services: - 25565:25565 networks: - minecraft + - internal smpxmc: image: itzg/minecraft-server @@ -34,6 +35,7 @@ services: - /srv/smpxmc/data:/data networks: - minecraft + - internal kasmc: image: itzg/minecraft-server @@ -49,6 +51,7 @@ services: - /srv/kasmc/data:/data networks: - minecraft + - internal vanilla: image: itzg/minecraft-server @@ -66,6 +69,7 @@ services: - /srv/vanillamc/data:/data networks: - minecraft + - internal ### END MINECRAFT ### # docker run -it --rm -p 7777:7777 -v $HOME/terraria/world:/root/.local/share/Terraria/Worlds ryshe/terraria:latest @@ -76,6 +80,8 @@ services: - 7777:7777 volumes: - /srv/smpxterraria/data:/root/.local/share/Terraria/Worlds + networks: + - internal # docker run -p : biosmarcel/scribble.rs --portHTTP= scribblers: @@ -85,4 +91,5 @@ services: - VIRTUAL_HOST=scribble.neo.ixvd.net - LETSENCRYPT_HOST=scribble.neo.ixvd.net networks: - - proxy \ No newline at end of file + - proxy + - internal \ No newline at end of file diff --git a/docker-compose.media.yml b/docker-compose.media.yml index 563ca66..d01f559 100644 --- a/docker-compose.media.yml +++ b/docker-compose.media.yml @@ -7,7 +7,6 @@ networks: config: - subnet: "172.16.20.0/24" - services: qbit: image: dyonr/qbittorrentvpn @@ -69,24 +68,6 @@ services: networks: - proxy - # lidarr: - # image: lscr.io/linuxserver/lidarr:latest - # container_name: lidarr - # environment: - # - LETSENCRYPT_HOST=lidarr.neo.famslof.nl - # - VIRTUAL_HOST=lidarr.neo.famslof.nl - # - VIRTUAL_PORT=8686 - # - PUID=1000 - # - PGID=113 - # - TZ=Europe/Amsterdam - # volumes: - # - /srv/lidarr/config:/config - # - /mnt/library/music:/music #optional - # - /mnt/library/downloads:/downloads #optional - # restart: unless-stopped - # networks: - # - proxy - jackett: image: lscr.io/linuxserver/jackett:latest container_name: jackett @@ -127,13 +108,5 @@ services: - /srv/jellyfin/config:/config - /mnt/library:/data restart: unless-stopped - networks: - - proxy - - jellyfin-vue: - image: ghcr.io/jellyfin/jellyfin-vue:unstable.2022-12-17.14796ba - environment: - - LETSENCRYPT_HOST=vue.fin.neo.famslof.nl - - VIRTUAL_HOST=vue.fin.neo.famslof.nl networks: - proxy \ No newline at end of file diff --git a/docker-compose.utils.yml b/docker-compose.utils.yml index cdff6da..d802b66 100644 --- a/docker-compose.utils.yml +++ b/docker-compose.utils.yml @@ -12,6 +12,7 @@ services: - BASE_URL=https://search.faulty.nl networks: - proxy + - internal whoogle: image: benbusby/whoogle-search @@ -21,6 +22,7 @@ services: - VIRTUAL_PORT=5000 networks: - proxy + - internal flexo: # arch repo mirror image: nroi/flexo:latest @@ -33,6 +35,7 @@ services: - /srv/flexo/config:/etc/flexo networks: - proxy + - internal syncthing: image: lscr.io/linuxserver/syncthing:latest @@ -55,6 +58,7 @@ services: restart: unless-stopped networks: - proxy + - internal backups: build: @@ -77,10 +81,9 @@ services: - MODE=standalone - LETSENCRYPT_HOST=neo.faulty.nl - VIRTUAL_HOST=neo.faulty.nl - - VIRTUAL_PATH=/ - - VIRTUAL_DEST=/ networks: - proxy + - internal transfersh: image: dutchcoders/transfer.sh:latest @@ -91,6 +94,7 @@ services: - VIRTUAL_PORT=8080 networks: - proxy + - internal dendrite: @@ -141,7 +145,7 @@ services: networks: - proxy - metrics - - default + - internal prometheus: build: @@ -155,6 +159,7 @@ services: image: prom/blackbox-exporter:latest networks: - metrics + - internal ## THIS CONTANIER IS AVAILABLE ON THE HOST ## node-exporter: @@ -191,6 +196,7 @@ services: restart: unless-stopped networks: - proxy + - internal shlink: image: shlinkio/shlink:stable diff --git a/docker-compose.web.yml b/docker-compose.web.yml index 5405c5e..025509f 100644 --- a/docker-compose.web.yml +++ b/docker-compose.web.yml @@ -11,6 +11,7 @@ services: - LETSENCRYPT_HOST=faulty.nl networks: - proxy + - internal ixvd-web: build: @@ -22,6 +23,7 @@ services: - LETSENCRYPT_HOST=ixvd.net networks: - proxy + - internal ghost: image: ghost:5.26.3-alpine @@ -42,7 +44,7 @@ services: - /srv/ghost/data:/var/lib/ghost/content networks: - proxy - - default + - internal ghost_db: image: mysql:8.0 @@ -50,4 +52,6 @@ services: environment: MYSQL_ROOT_PASSWORD: i_dont_touch_the_internet volumes: - - /srv/ghost/other/db:/var/lib/mysql \ No newline at end of file + - /srv/ghost/other/db:/var/lib/mysql + networks: + - internal \ No newline at end of file