diff --git a/docker-compose.yml b/docker-compose.yml index 767294a..e3d783a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,44 +1,47 @@ services: - zess-db: - image: postgres:alpine3.20 - environment: - - POSTGRES_PASSWORD=zess - - POSTGRES_USER=postgres - - POSTGRES_DB=zess - volumes: - - db-data:/var/lib/postgresql/data - ports: - - 5432:5432 - extra_hosts: - - "host.docker.internal:host-gateway" + zess-db: + image: postgres:alpine3.20 + environment: + - POSTGRES_PASSWORD=zess + - POSTGRES_USER=zess + - POSTGRES_DB=zess + volumes: + - db-data:/var/lib/postgresql/data + ports: + - 5432:5432 + extra_hosts: + - "host.docker.internal:host-gateway" - zess-backend: - env_file: "vingo/.env" - build: - context: vingo - dockerfile: Dockerfile.dev - ports: - - 4000:4000 - volumes: - - ./vingo:/backend - extra_hosts: - - "host.docker.internal:host-gateway" - stop_grace_period: 1s - depends_on: - - zess-db + zess-backend: + env_file: "vingo/.env" + environment: + - CARGO_BUILD_TARGET_DIR=/target + build: + context: vingo + dockerfile: Dockerfile.dev + ports: + - 4000:4000 + volumes: + - ./vingo:/backend + - backend-target:/target + extra_hosts: + - "host.docker.internal:host-gateway" + stop_grace_period: 1s + depends_on: + - zess-db - zess-frontend: - build: - context: vinvoor - dockerfile: Dockerfile.dev - user: ${CURRENT_UID} - ports: - - 5173:5173 - volumes: - - ./vinvoor:/frontend - extra_hosts: - - "host.docker.internal:host-gateway" + zess-frontend: + build: + context: vinvoor + dockerfile: Dockerfile.dev + user: ${CURRENT_UID} + ports: + - 5173:5173 + volumes: + - ./vinvoor:/frontend + extra_hosts: + - "host.docker.internal:host-gateway" volumes: - backend-packages: - db-data: + backend-target: + db-data: diff --git a/vingo/dev.env b/vingo/dev.env index d78b9bd..6c6c3b9 100644 --- a/vingo/dev.env +++ b/vingo/dev.env @@ -1,7 +1,7 @@ DEBUG_LOGIN="FALSE" DEVELOPMENT="TRUE" -POSTGRES_CONNECTION_STRING="postgres://postgres:zess@host.docker.internal/zess?sslmode=disable" +POSTGRES_CONNECTION_STRING="postgres://zess:zess@host.docker.internal/zess?sslmode=disable" ZAUTH_URL="https://zauth.zeus.gent" ZAUTH_CALLBACK_PATH="http://localhost:4000/api/auth/callback" FRONTEND_URL="http://localhost:5173/"