diff --git a/compose.yml b/compose.yml index 8130dff..d206b69 100644 --- a/compose.yml +++ b/compose.yml @@ -5,8 +5,7 @@ services: volumes: - "site_content:/var/www/html/" networks: - - backend - - proxy + - internal environment: - DB_HOST=db - DB_USER=site @@ -18,10 +17,10 @@ services: configs: - source: php_uploads_conf target: /usr/local/etc/php/conf.d/uploads.ini - - source: entrypoint_conf - target: /docker-entrypoint.sh - mode: 0555 - entrypoint: /docker-entrypoint.sh + # - source: entrypoint_conf + # target: /docker-entrypoint.sh + # mode: 0555 + # entrypoint: /docker-entrypoint.sh depends_on: - db deploy: @@ -33,7 +32,10 @@ services: frontend: image: nginx:1.19.2 networks: + - internal - proxy + depends_on: + - backend deploy: restart_policy: condition: on-failure @@ -53,18 +55,18 @@ services: configs: - source: nginx_default_conf target: /etc/nginx/conf.d/default.conf - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] - interval: 30s - timeout: 10s - retries: 10 - start_period: 1m + # healthcheck: + # test: ["CMD", "curl", "-f", "http://localhost"] + # interval: 30s + # timeout: 10s + # retries: 10 + # start_period: 1m db: image: "mariadb:10.6" volumes: - "mariadb:/var/lib/mysql" networks: - - backend + - internal environment: - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password - MYSQL_DATABASE=site @@ -76,7 +78,8 @@ services: deploy: labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: - backend: + internal: + internal: true proxy: external: true volumes: