diff --git a/compose.yml b/compose.yml index 9ec86c8..1b2b506 100644 --- a/compose.yml +++ b/compose.yml @@ -3,11 +3,14 @@ services: frontend-v2: build: FRONTEND_V2/. image: codebattles-frontend-v2 + ports: + - "8002:80" restart: unless-stopped environment: VITE_ENV: "production" networks: + - with-internet - no-internet backend: @@ -15,9 +18,9 @@ services: image: codebattles-backend-v2 environment: SERVER_PORT: 8000 - SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${DB_NAME} - SPRING_DATASOURCE_USERNAME: ${DB_USER} - SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD} + SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/cb + SPRING_DATASOURCE_USERNAME: postgres + SPRING_DATASOURCE_PASSWORD: admin ports: - "8000:8000" depends_on: @@ -27,19 +30,22 @@ services: - postgres restart: unless-stopped networks: + - with-internet - no-internet + - checkers-net postgres: image: postgres:13.3-alpine environment: - POSTGRES_DB: ${DB_NAME} - POSTGRES_USER: ${DB_USER} - PGUSER: ${DB_USER} - POSTGRES_PASSWORD: ${DB_PASSWORD} + POSTGRES_DB: "cb" + POSTGRES_USER: "postgres" + PGUSER: "postgres" + POSTGRES_PASSWORD: "admin" REQUIRE_CAPTCHA: false + ports: - "25565:5432" healthcheck: - test: [ "CMD-SHELL", "pg_isready", "-U", "${DB_USER}", "-d", "${DB_NAME}" ] + test: [ "CMD-SHELL", "pg_isready", "-U", "postgres", "-d", "cb" ] interval: 2s timeout: 2s restart: unless-stopped @@ -58,14 +64,14 @@ services: networks: - with-internet - no-internet - - # checker-java: - # build: - # dockerfile: z_checkers_dockerfiles/Java.Dockerfile - # image: codebattles-checker-java - # restart: unless-stopped - # networks: - # - no-internet + + checker-java: + build: + dockerfile: z_checkers_dockerfiles/Java.Dockerfile + image: codebattles-checker-java + restart: unless-stopped + networks: + - checkers-net checker-python: build: @@ -73,16 +79,26 @@ services: image: codebattles-checker-python restart: unless-stopped networks: - - no-internet + - checkers-net + +# checker-kumir: +# build: +# dockerfile: z_checkers_dockerfiles/Kumir.Dockerfile +# image: codebattles-checker-kumir +# restart: unless-stopped +# networks: +# - with-internet +# - no-internet + # checker-cpp: # build: -# dockerfile: z_checkers_dockerfiles/CPP.Dockerfile +# dockerfile: ./CPP.Dockerfile # image: codebattles-checker-cpp # restart: unless-stopped # checker-pascal: # build: -# dockerfile: z_checkers_dockerfiles/Pascal.Dockerfile +# dockerfile: ./Pascal.Dockerfile # image: codebattles-checker-pascal # restart: unless-stopped @@ -90,7 +106,9 @@ networks: no-internet: driver: bridge internal: true + checkers-net: + driver: bridge + internal: true with-internet: driver: bridge -