diff --git a/docker-compose.yml b/docker-compose.yml index 9e3e8fc..de813ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: condition: service_healthy restart: true networks: + - default - intra - nginx @@ -27,7 +28,7 @@ services: restart: always networks: - pgadmin - - intra + - default healthcheck: test: [ "CMD-SHELL", "pg_isready" ] interval: 5s @@ -37,28 +38,9 @@ services: - ${PWD}/postgres-data:/var/lib/postgresql/data env_file: prod.env -# ftpd: -# build: -# context: ./pure_ftpd -# dockerfile: Dockerfile2 -# container_name: ftpd -# ports: -# - "10042:21" -# - "30000-30009:30000-30009" -# volumes: -# - /data/git_data:/home/data/ -# - ${PWD}/pure_ftpd/passwd:/etc/pure-ftpd/passwd -# - ${PWD}/pure_ftpd/ssl:/etc/ssl/private/:ro -# environment: -# PUBLICHOST: 0.0.0.0 -# FTP_USER_NAME: test -# FTP_USER_PASS: test -# FTP_USER_HOME: /home/data -# ADDED_FLAGS: --tls=1 -# restart: no - networks: intra: + name: intra driver: bridge pgadmin: name: pgadmin