From f7ae9d4ce509fea98d0c8062db6ad42c5cd0e791 Mon Sep 17 00:00:00 2001 From: BA1001 Date: Wed, 7 Dec 2022 21:39:45 +0100 Subject: [PATCH] Unify Docker Compose files --- opt/endlessh/docker-compose.yml | 17 +++++++++-------- opt/gitea/docker-compose.yml | 2 +- opt/kanboard/docker-compose.yml | 2 +- opt/openldap/docker-compose.yml | 6 +----- opt/registry/docker-compose.yml | 8 +++++--- opt/syncthing/docker-compose.yml | 14 ++++++++------ opt/website/docker-compose.yml | 4 ++-- opt/yopass/docker-compose.yml | 13 ++++++++++++- 8 files changed, 39 insertions(+), 27 deletions(-) diff --git a/opt/endlessh/docker-compose.yml b/opt/endlessh/docker-compose.yml index b8b99f9..3a44180 100644 --- a/opt/endlessh/docker-compose.yml +++ b/opt/endlessh/docker-compose.yml @@ -1,12 +1,13 @@ -version: "2.1" +version: "3.0" + services: endlessh: - image: lscr.io/linuxserver/endlessh:latest container_name: endlessh - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Stockholm - ports: - - 3322:2222 + image: lscr.io/linuxserver/endlessh:latest restart: unless-stopped + environment: + PUID: 1000 + PGID: 1000 + TZ: Europe/Stockholm + ports: + - "3322:2222" diff --git a/opt/gitea/docker-compose.yml b/opt/gitea/docker-compose.yml index fc17579..0b1b64c 100644 --- a/opt/gitea/docker-compose.yml +++ b/opt/gitea/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.0" networks: gitea: diff --git a/opt/kanboard/docker-compose.yml b/opt/kanboard/docker-compose.yml index 57f8cc6..c8093df 100644 --- a/opt/kanboard/docker-compose.yml +++ b/opt/kanboard/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.0" networks: kanboard: diff --git a/opt/openldap/docker-compose.yml b/opt/openldap/docker-compose.yml index ae16a0d..78fdc8c 100644 --- a/opt/openldap/docker-compose.yml +++ b/opt/openldap/docker-compose.yml @@ -1,9 +1,5 @@ -version: "3.8" - -networks: - openldap: - external: false +version: "3.0" services: openldap: diff --git a/opt/registry/docker-compose.yml b/opt/registry/docker-compose.yml index 4169f1d..33a8312 100644 --- a/opt/registry/docker-compose.yml +++ b/opt/registry/docker-compose.yml @@ -1,10 +1,10 @@ -version: '3' +version: "3.0" services: registry: + container_name: registry image: registry:2.8.1 - ports: - - "5000:5000" + restart: unless-stopped environment: REGISTRY_AUTH: htpasswd REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm @@ -12,6 +12,8 @@ services: volumes: - data:/var/lib/registry - ./registry.password:/registry.password + ports: + - "5000:5000" volumes: data: diff --git a/opt/syncthing/docker-compose.yml b/opt/syncthing/docker-compose.yml index 02f5127..e44f10b 100644 --- a/opt/syncthing/docker-compose.yml +++ b/opt/syncthing/docker-compose.yml @@ -1,14 +1,16 @@ -version: "3" +version: "3.0" + services: syncthing: + container_name: syncthing image: syncthing/syncthing:1.22.2 restart: unless-stopped - network_mode: host - hostname: gergesa environment: - - PUID=1000 - - PGID=1000 - - STGUIADDRESS= + PUID: 1000 + PGID: 1000 + STGUIADDRESS: "" + hostname: gergesa + network_mode: host volumes: - syncthing:/var/syncthing diff --git a/opt/website/docker-compose.yml b/opt/website/docker-compose.yml index 34ed7f5..8703cc4 100644 --- a/opt/website/docker-compose.yml +++ b/opt/website/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.0" services: website: @@ -6,4 +6,4 @@ services: image: cr.jilits.se/jilits/website:0.2.1 restart: unless-stopped ports: - - 8000:1313 + - "8000:1313" diff --git a/opt/yopass/docker-compose.yml b/opt/yopass/docker-compose.yml index c11c845..28d1578 100644 --- a/opt/yopass/docker-compose.yml +++ b/opt/yopass/docker-compose.yml @@ -1,15 +1,26 @@ version: "3.0" +networks: + yopass: + external: false + services: memcached: image: memcached restart: always + networks: + - yopass expose: - "11211" yopass: + container_name: yopass image: jhaals/yopass restart: always + command: "--memcached=memcached:11211 --port 80" + networks: + - yopass ports: - "8007:80" - command: "--memcached=memcached:11211 --port 80" + depends_on: + - memcached