diff --git a/docker-compose.yml b/docker-compose.yml index 91525654..8c5214d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ services: - app: + klz-app: image: registry.infra.mintel.me/mintel/klz-cables.com:${IMAGE_TAG:-latest} restart: always networks: - - infra + - default env_file: - ${ENV_FILE:-.env} labels: @@ -13,11 +13,12 @@ services: image: varnish:7 restart: always networks: + - default - infra volumes: - ./varnish/default.vcl:/etc/varnish/default.vcl:ro tmpfs: - - /var/lib/varnish:exec + - /var/lib/varnish:exec,mode=1777 environment: VARNISH_SIZE: ${VARNISH_CACHE_SIZE:-256M} labels: @@ -59,6 +60,7 @@ services: container_name: ${PROJECT_NAME:-klz-cables}-gatekeeper restart: always networks: + - default - infra env_file: - ${ENV_FILE:-.env} @@ -72,6 +74,7 @@ services: image: directus/directus:11 restart: always networks: + - default - infra env_file: - ${ENV_FILE:-.env} @@ -108,7 +111,7 @@ services: image: postgres:15-alpine restart: always networks: - - infra + - default env_file: - ${ENV_FILE:-.env} environment: @@ -119,6 +122,8 @@ services: - directus-db-data:/var/lib/postgresql/data networks: + default: + name: ${PROJECT_NAME:-klz-cables}-internal infra: external: true diff --git a/package.json b/package.json index a7d545ca..7cf31a37 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "name": "klz-cables-nextjs", "private": true, "scripts": { - "dev": "docker network create infra 2>/dev/null || true && echo '\\nšŸš€ Development Environment Starting...\\n\\nšŸ“± App: http://klz.localhost\\nšŸ—„ļø CMS: http://cms.klz.localhost/admin\\n🚦 Traefik: http://localhost:8080\\n\\n(Press Ctrl+C to stop)\\n' && docker-compose down --remove-orphans && docker-compose up app directus directus-db", + "dev": "docker network create infra 2>/dev/null || true && echo '\\nšŸš€ Development Environment Starting...\\n\\nšŸ“± App: http://klz.localhost\\nšŸ—„ļø CMS: http://cms.klz.localhost/admin\\n🚦 Traefik: http://localhost:8080\\n\\n(Press Ctrl+C to stop)\\n' && docker-compose down --remove-orphans && docker-compose up klz-app directus directus-db", "dev:local": "next dev", "build": "next build", "start": "next start", diff --git a/varnish/default.vcl b/varnish/default.vcl index 846b58e3..80aad677 100644 --- a/varnish/default.vcl +++ b/varnish/default.vcl @@ -3,7 +3,7 @@ vcl 4.1; import std; backend default { - .host = "app"; + .host = "klz-app"; .port = "3000"; .first_byte_timeout = 60s; } @@ -11,7 +11,6 @@ backend default { acl purge { "localhost"; "127.0.0.1"; - "infra"; # Allow purge from within the infra network } sub vcl_recv {