diff --git a/gitea.yml b/gitea.yml index 3b981fb..38a0b0f 100644 --- a/gitea.yml +++ b/gitea.yml @@ -31,10 +31,6 @@ services: networks: - proxynet depends_on: - traefik: - condition: service_started - postgres: - condition: service_started gitea-cache: condition: service_started labels: @@ -69,4 +65,8 @@ services: logging: driver: "json-file" options: - max-size: "1m" \ No newline at end of file + max-size: "1m" + +networks: + proxynet: + external: true diff --git a/nginx.yml b/nginx.yml index 186d80e..6b8947d 100644 --- a/nginx.yml +++ b/nginx.yml @@ -10,3 +10,7 @@ services: - "traefik.http.routers.nginx.rule=Host(`${DOMAIN}`)" volumes: - ./www/main:/usr/share/nginx/html + +networks: + proxynet: + external: true \ No newline at end of file diff --git a/pgadmin.yml b/pgadmin.yml index 52904e4..4e0436e 100644 --- a/pgadmin.yml +++ b/pgadmin.yml @@ -18,4 +18,8 @@ services: PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False' volumes: - ./data/pgadmin:/var/lib/pgadmin - - ./secrets/httpauth:/httpauth \ No newline at end of file + - ./secrets/httpauth:/httpauth + +networks: + proxynet: + external: true \ No newline at end of file diff --git a/postgres.yml b/postgres.yml index c108fd0..6e6a9e1 100644 --- a/postgres.yml +++ b/postgres.yml @@ -26,4 +26,8 @@ services: command: > sh -c "chmod 755 /init-db/init-database.sh" volumes: - - ./init-db:/init-db \ No newline at end of file + - ./init-db:/init-db + +networks: + proxynet: + external: true \ No newline at end of file diff --git a/readme.md b/readme.md index 67615c7..039ae92 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,8 @@ Init: sudo git clone git@rozenlab.com:leo/repo-server.git && sudo docker network create proxynet && cd repo-server && sudo chmod +x start.sh +sudo git pull git@rozenlab.com:leo/repo-server.git + --------------------------------------------------------------------- All run: diff --git a/traefik.yml b/traefik.yml index 530dcb7..4d08ad0 100644 --- a/traefik.yml +++ b/traefik.yml @@ -16,7 +16,7 @@ services: - '--log=true' #- "--log.level=INFO" - "--providers.docker.exposedByDefault=false" - - "--providers.docker.network=proxynet" + - "--providers.docker.network=repo-server_proxynet" #Entrypoints: - "--entrypoints.http.address=:80" - "--entrypoints.https.address=:443"