diff --git a/docker-compose.yaml b/docker-compose.yaml index 636d58a..5222354 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,11 +1,19 @@ services: db: - image: postgres:16.1-alpine3.19 + image: postgres:16.13-alpine3.23 ports: - "5432:5432" environment: POSTGRES_USER: "kemkas" POSTGRES_PASSWORD: "kemkas-dev42" + volumes: + - db-data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U kemkas -d postgres"] + interval: 5s + timeout: 3s + retries: 20 + start_period: 5s backend: image: ghcr.io/morbalint/kemkas-backend:b8565f8e @@ -15,6 +23,9 @@ services: ConnectionStrings__DefaultConnection: "Server=db;User Id=kemkas;Password=kemkas-dev42" Email__DomainName: "mail.kemkas.hu" Email__ApiKey: "" + depends_on: + db: + condition: service_healthy proxy: image: nginx:latest @@ -23,4 +34,9 @@ services: volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - $HOME/.aspnet/https/kemkas.pem:/etc/nginx/kemkas.pem - - $HOME/.aspnet/https/kemkas.key:/etc/nginx/kemkas.key \ No newline at end of file + - $HOME/.aspnet/https/kemkas.key:/etc/nginx/kemkas.key + depends_on: + - backend + +volumes: + db-data: \ No newline at end of file diff --git a/frontend/.env.development b/frontend/.env.development index 60ad7c8..f55486b 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -1,3 +1,3 @@ PORT=44478 -HTTPS=true +HTTPS=false diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index c5c283e..b5751b6 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -12,6 +12,7 @@ export default defineConfig(({ mode }) => { port, https, strictPort: true, + allowedHosts: ['localhost', 'host.docker.internal', 'frontend'], }, test: { globals: true, diff --git a/nginx.conf b/nginx.conf index f616def..3f53d6c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -47,7 +47,7 @@ http { #access_log /var/log/nginx/host.access.log main; location / { - proxy_pass https://frontend; + proxy_pass http://frontend; } # redirect server error pages to the static page /50x.html