Isolated Docker networks

2023-11-10 05:28:42 +08:00 · 2023-11-10 05:28:42 +08:00 · 5a4e130b58
commit 5a4e130b58
parent b178162ced
34 changed files with 118 additions and 147 deletions
--- a/templates/compose/4get.yaml.j2
+++ b/templates/compose/4get.yaml.j2
@ -20,9 +20,8 @@ services:
    ports:
      - '8907:80'
    networks:
-      - IPv4
+      - 4get

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  4get:
+    name: 4get
--- a/templates/compose/anonymousoverflow.yaml.j2
+++ b/templates/compose/anonymousoverflow.yaml.j2
@ -18,9 +18,8 @@ services:
    ports:
      - '8898:8080'
    networks:
-      - IPv4
+      - anonymousoverflow

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  anonymousoverflow:
+    name: anonymousoverflow
--- a/templates/compose/authelia.yaml.j2
+++ b/templates/compose/authelia.yaml.j2
@ -16,9 +16,8 @@ services:
      - {{ docker_dir }}/authelia:/config
    restart: unless-stopped
    networks:
-      - IPv4
+      - authelia

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  authelia:
+    name: authelia
--- a/templates/compose/binternet.yaml.j2
+++ b/templates/compose/binternet.yaml.j2
@ -14,9 +14,8 @@ services:
    ports:
      - '8896:80'
    networks:
-      - IPv4
+      - binternet

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  binternet:
+    name: binternet
--- a/templates/compose/breezewiki.yaml.j2
+++ b/templates/compose/breezewiki.yaml.j2
@ -16,9 +16,8 @@ services:
    volumes:
      - {{ docker_dir }}/breezewiki/config.ini:/app/config.ini
    networks:
-      - IPv4
+      - breezewiki

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  breezewiki:
+    name: breezewiki
--- a/templates/compose/cinny.yaml.j2
+++ b/templates/compose/cinny.yaml.j2
@ -14,9 +14,8 @@ services:
      - 8901:80
    restart: unless-stopped
    networks:
-      - IPv4
+      - cinny

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  cinny:
+    name: cinny
--- a/templates/compose/etherpad.yaml.j2
+++ b/templates/compose/etherpad.yaml.j2
@ -40,7 +40,7 @@ services:
      - 8891:9001
    restart: unless-stopped
    networks:
-      - IPv4
+      - etherpad
      
  etherpaddb:
    image: postgres:16-alpine
@ -60,9 +60,8 @@ services:
      - {{ docker_dir }}/etherpad/dump:/dump
    restart: unless-stopped
    networks:
-      - IPv4
+      - etherpad

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  etherpad:
+    name: etherpad
--- a/templates/compose/firefox.yaml.j2
+++ b/templates/compose/firefox.yaml.j2
@ -28,11 +28,10 @@ services:
    shm_size: "2gb"
    restart: unless-stopped
    networks:
-      - IPv4
+      - firefox

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  firefox:
+    name: firefox


--- a/templates/compose/geoipupdate.yaml.j2
+++ b/templates/compose/geoipupdate.yaml.j2
@ -18,8 +18,8 @@ services:
    volumes:
      - {{ docker_dir }}/caddy/:/usr/share/GeoIP/
    networks:
-      - IPv4
+      - geoipupdate
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  geoipupdate:
+    name: geoipupdate
--- a/templates/compose/gitea.yaml.j2
+++ b/templates/compose/gitea.yaml.j2
@ -30,7 +30,7 @@ services:
    ports:
      - "3000:3000"
    networks:
-      - IPv4
+      - gitea

  gitea-db:
    image: postgres:14
@ -48,12 +48,10 @@ services:
      - {{ docker_dir }}/gitea/data/postgres:/var/lib/postgresql/data
    restart: always
    networks:
-      - IPv4
+      - gitea

 networks:
-  IPv4:
-    external:
-      name: IPv4
-
+  gitea:
+    name: gitea

 # Cron in Gitea Action only works in Nightly for now
--- a/templates/compose/gothub.yaml.j2
+++ b/templates/compose/gothub.yaml.j2
@ -30,9 +30,8 @@ services:
    ports:
      - '8900:3000'
    networks:
-      - IPv4
+      - gothub

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  gothub:
+    name: gothub
--- a/templates/compose/imgin.yaml.j2
+++ b/templates/compose/imgin.yaml.j2
@ -15,9 +15,8 @@ services:
    ports:
      - '8899:8080'
    networks:
-      - IPv4
+      - imgin

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  imgin:
+    name: imgin
--- a/templates/compose/it-tools.yaml.j2
+++ b/templates/compose/it-tools.yaml.j2
@ -14,9 +14,8 @@ services:
    ports:
      - 8892:80
    networks:
-      - IPv4
+      - it-tools

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  it-tools:
+    name: it-tools
--- a/templates/compose/libreddit.yaml.j2
+++ b/templates/compose/libreddit.yaml.j2
@ -20,9 +20,8 @@ services:
    ports:
      - 8882:8080
    networks:
-      - IPv4
+      - libreddit

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  libreddit:
+    name: libreddit
--- a/templates/compose/libredditarm.yaml.j2
+++ b/templates/compose/libredditarm.yaml.j2
@ -20,9 +20,8 @@ services:
    ports:
      - 8882:8080
    networks:
-      - IPv4
+      - libreddit

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  libreddit:
+    name: libreddit
--- a/templates/compose/libremdb.yaml.j2
+++ b/templates/compose/libremdb.yaml.j2
@ -19,9 +19,8 @@ services:
      - 8905:3000
    restart: unless-stopped 
    networks:
-      - IPv4
+      - libremdb

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  libremdb:
+    name: libremdb
--- a/templates/compose/mlmym.yaml.j2
+++ b/templates/compose/mlmym.yaml.j2
@ -20,9 +20,8 @@ services:
    ports:
      - '8902:8080'
    networks:
-      - IPv4
+      - mlmym

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  mlmym:
+    name: mlmym
--- a/templates/compose/nitter.yaml.j2
+++ b/templates/compose/nitter.yaml.j2
@ -26,7 +26,7 @@ services:
      timeout: 5s
      retries: 2
    networks:
-      - IPv4
+      - nitter

  nitter-redis:
    image: redis:alpine
@ -47,9 +47,8 @@ services:
      timeout: 5s
      retries: 2
    networks:
-      - IPv4
+      - nitter

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  nitter:
+    name: nitter
--- a/templates/compose/ntfy.yaml.j2
+++ b/templates/compose/ntfy.yaml.j2
@ -31,12 +31,11 @@ services:
        retries: 3
        start_period: 40s
    networks:
-      - IPv4
+      - ntfy

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  ntfy:
+    name: ntfy

 # touch {{ docker_dir }}/ntfy/cache.db && touch {{ docker_dir }}/ntfy/user.db
 # docker exec -it ntfy ntfy user add --role=admin opnxng
--- a/templates/compose/photon.yaml.j2
+++ b/templates/compose/photon.yaml.j2
@ -19,9 +19,8 @@ services:
    ports:
      - '8903:3000'
    networks:
-      - IPv4
+      - photon

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  photon:
+    name: photon
--- a/templates/compose/privatebin.yaml.j2
+++ b/templates/compose/privatebin.yaml.j2
@ -14,11 +14,10 @@ services:
    volumes:
      - {{ docker_dir }}/privatebin/data:/srv/data
    networks:
-      - IPv4
+      - privatebin

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  privatebin:
+    name: privatebin

 # sudo chown 65534:82 {{ docker_dir }}/privatebin/data
--- a/templates/compose/proxigram.yaml.j2
+++ b/templates/compose/proxigram.yaml.j2
@ -32,7 +32,7 @@ services:
    ports:
      - 8908:3000
    networks:
-      - IPv4
+      - proxigram
      
  proxigram-redis:
    container_name: proxigram-redis
@ -45,9 +45,8 @@ services:
      - REDIS_URL=redis:6379
    restart: unless-stopped
    networks:
-      - IPv4
+      - proxigram

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  proxigram:
+    name: proxigram
--- a/templates/compose/proxitok.yaml.j2
+++ b/templates/compose/proxitok.yaml.j2
@ -30,7 +30,7 @@ services:
      - proxitok-redis
      - signer
    networks:
-      - IPv4
+      - proxitok
      
  proxitok-redis:
    container_name: proxitok-redis
@ -50,7 +50,7 @@ services:
      - ALL
    restart: unless-stopped
    networks:
-      - IPv4
+      - proxitok

  signer:
    container_name: proxitok-signer
@ -67,8 +67,8 @@ services:
    cap_drop:
      - ALL
    networks:
-      - IPv4
+      - proxitok
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  proxitok:
+    name: proxitok
--- a/templates/compose/quetre.yaml.j2
+++ b/templates/compose/quetre.yaml.j2
@ -16,8 +16,8 @@ services:
      - 8904:3000
    restart: unless-stopped 
    networks:
-      - IPv4
+      - quetre
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  quetre:
+    name: quetre
--- a/templates/compose/rat-aint-tieba.yaml.j2
+++ b/templates/compose/rat-aint-tieba.yaml.j2
@ -14,8 +14,8 @@ services:
    ports:
      - '8910:8886'
    networks:
-      - IPv4
+      - rat-aint-tieba
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  rat-aint-tieba:
+    name: rat-aint-tieba
--- a/templates/compose/runner.yaml.j2
+++ b/templates/compose/runner.yaml.j2
@ -22,11 +22,11 @@ services:
      - GITEA_RUNNER_REGISTRATION_TOKEN={{ gitea_runner_registration_token }}
      - GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:16-bullseye,ubuntu-22.04:docker://node:16-bullseye,ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster,runner:host
    networks:
-      - IPv4
+      - runner
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  runner:
+    name: runner

 # DinD containers cannot resolve *.github.com unless daemon.json is mounted
 # https://gitea.com/gitea/act_runner/issues/381#issuecomment-755182
--- a/templates/compose/scribe.yaml.j2
+++ b/templates/compose/scribe.yaml.j2
@ -21,8 +21,8 @@ services:
    ports:
      - 8890:8088
    networks:
-      - IPv4
+      - scribe
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  scribe:
+    name: scribe
--- a/templates/compose/send.yaml.j2
+++ b/templates/compose/send.yaml.j2
@ -28,7 +28,7 @@ services:
    ports:
      - 8886:1443
    networks:
-      - IPv4
+      - send
    labels:
      - "com.centurylinklabs.watchtower.enable=false"
      
@ -48,13 +48,11 @@ services:
    labels:
      - "com.centurylinklabs.watchtower.enable=false"
    networks:
-      - IPv4
+      - send

 networks:
-  IPv4:
-    external:
-      name: IPv4
-
+  send:
+    name: send

 # Clear expired uploads
 # 0 */3 * * *  find {{ docker_dir }}/send/uploads/ -name 7-\* -mmin +10130 -exec rm {} \;
--- a/templates/compose/simplytranslate.yaml.j2
+++ b/templates/compose/simplytranslate.yaml.j2
@ -22,8 +22,8 @@ services:
      - 8889:5000
    restart: unless-stopped 
    networks:
-      - IPv4
+      - simplytranslate
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  simplytranslate:
+    name: simplytranslate
--- a/templates/compose/stirling-pdf.yaml.j2
+++ b/templates/compose/stirling-pdf.yaml.j2
@ -20,8 +20,8 @@ services:
    ports:
      - 8887:8080
    networks:
-      - IPv4
+      - stirling-pdf
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  stirling-pdf:
+    name: stirling-pdf
--- a/templates/compose/teddit.yaml.j2
+++ b/templates/compose/teddit.yaml.j2
@ -33,7 +33,7 @@ services:
    logging:
        driver: none
    networks:
-      - IPv4
+      - teddit

  teddit-redis:
    container_name: teddit-redis
@ -46,9 +46,8 @@ services:
      - REDIS_REPLICATION_MODE=master
    restart: unless-stopped
    networks:
-      - IPv4
+      - teddit

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  teddit:
+    name: teddit
--- a/templates/compose/voyager.yaml.j2
+++ b/templates/compose/voyager.yaml.j2
@ -15,9 +15,8 @@ services:
    ports:
      - '8895:5314'
    networks:
-      - IPv4
+      - voyager

 networks:
-  IPv4:
-    external:
-      name: IPv4
+  voyager:
+    name: voyager
--- a/templates/compose/wolfree.yaml.j2
+++ b/templates/compose/wolfree.yaml.j2
@ -14,8 +14,8 @@ services:
    ports:
      - '8906:80'
    networks:
-      - IPv4
+      - wolfree
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  wolfree:
+    name: wolfree
--- a/vars/services.yml
+++ b/vars/services.yml
@ -1,9 +1,6 @@
-saetup:
-  oracle3:
-    - runner
 compose:
-  oracle3:
-    - runner
+  oracle4:
+    - caddy

 # ----------------------------------------------------------------------------------------------------