diff --git a/docker-compose.yaml b/caddy/docker-compose.yaml similarity index 94% rename from docker-compose.yaml rename to caddy/docker-compose.yaml index f355f71..6b9dc57 100644 --- a/docker-compose.yaml +++ b/caddy/docker-compose.yaml @@ -1,6 +1,5 @@ -version: "3.3" -networks: - caddy: +version: "3.9" + services: portainer: image: portainer/portainer-ce:latest @@ -31,7 +30,13 @@ services: - /root/containers/caddy/caddy_config:/config networks: - caddy + volumes: caddy_data: external: true caddy_config: + +networks: + caddy: + external: true + name: caddy diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml index 000dbf2..730f915 100644 --- a/gitea/docker-compose.yaml +++ b/gitea/docker-compose.yaml @@ -20,6 +20,7 @@ services: - /etc/localtime:/etc/localtime:ro networks: - postgresql-network + - caddy ports: - "${GIT_PORT}:3000" - "222:22" @@ -27,8 +28,3 @@ services: volumes: gitea: name: gitea - -networks: - postgresql-network: - external: true - name: postgresql-network diff --git a/postgresql/docker-compose.yaml b/postgresql/docker-compose.yaml index 177d406..6d51ae5 100644 --- a/postgresql/docker-compose.yaml +++ b/postgresql/docker-compose.yaml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.9" services: postgresql: @@ -25,6 +25,7 @@ services: networks: - postgresql-network + - caddy env_file: - ../stack.env