From 73c91185b8d2901965def46dd703895f6aacbdca Mon Sep 17 00:00:00 2001
From: Doctorixx <61980858+Windows-up@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:09:03 +0300
Subject: [PATCH] make dockerfiles simpler

---
 prod-docker-compose.yml => compose.yml | 192 ++++++++++++-------------
 docker-compose.yml                     | 115 ---------------
 test-docker-compose.yml                |  70 ---------
 3 files changed, 96 insertions(+), 281 deletions(-)
 rename prod-docker-compose.yml => compose.yml (75%)
 delete mode 100644 docker-compose.yml
 delete mode 100644 test-docker-compose.yml

diff --git a/prod-docker-compose.yml b/compose.yml
similarity index 75%
rename from prod-docker-compose.yml
rename to compose.yml
index 9c71f5a..9ec86c8 100644
--- a/prod-docker-compose.yml
+++ b/compose.yml
@@ -1,96 +1,96 @@
-version: "3.9"
-services:
-  frontend-v2:
-    build: FRONTEND_V2/.
-    image: ghcr.io/codebattles-nn/frontend-v2
-    restart: unless-stopped
-    environment:
-      VITE_ENV: "production"
-
-    networks:
-      - no-internet
-
-  backend:
-    build: BACKEND_V2/.
-    image: ghcr.io/codebattles-nn/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}
-    ports:
-      - "8000:8000"
-    depends_on:
-      postgres:
-        condition: service_healthy
-    links:
-      - postgres
-    restart: unless-stopped
-    networks:
-      - no-internet
-  postgres:
-    image: postgres:13.3-alpine
-    environment:
-      POSTGRES_DB: ${DB_NAME}
-      POSTGRES_USER: ${DB_USER}
-      PGUSER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      REQUIRE_CAPTCHA: false
-    ports:
-      - "25565:5432"
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready", "-U", "${DB_USER}", "-d", "${DB_NAME}" ]
-      interval: 2s
-      timeout: 2s
-    restart: unless-stopped
-    networks:
-      - with-internet
-      - no-internet
-
-  gateway:
-    build: GATEWAY/.
-    image: ghcr.io/codebattles-nn/gateway
-    ports:
-      - "2500:80"
-    depends_on:
-      - backend
-    restart: unless-stopped
-    networks:
-      - with-internet
-      - no-internet
-
-#  checker-java:
-#    build:
-#      dockerfile: z_checkers_dockerfiles/Java.Dockerfile
-#    image: ghcr.io/codebattles-nn/checker-java
-#    restart: unless-stopped
-#    networks:
-#      - no-internet
-
-  checker-python:
-    build:
-      dockerfile: z_checkers_dockerfiles/Python.Dockerfile
-    image: ghcr.io/codebattles-nn/checker-python
-    restart: unless-stopped
-    networks:
-      - no-internet
-
-#  checker-cpp:
-#    build:
-#      dockerfile: z_checkers_dockerfiles/CPP.Dockerfile
-#    image: ghcr.io/codebattles-nn/checker-cpp
-#    restart: unless-stopped
-#  checker-pascal:
-#    build:
-#      dockerfile: z_checkers_dockerfiles/Pascal.Dockerfile
-#    image: ghcr.io/codebattles-nn/checker-pascal
-#    restart: unless-stopped
-
-networks:
-  no-internet:
-    driver: bridge
-    internal: true
-  with-internet:
-    driver: bridge
-
-
+version: "3.9"
+services:
+  frontend-v2:
+    build: FRONTEND_V2/.
+    image: codebattles-frontend-v2
+    restart: unless-stopped
+    environment:
+      VITE_ENV: "production"
+
+    networks:
+      - no-internet
+
+  backend:
+    build: BACKEND_V2/.
+    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}
+    ports:
+      - "8000:8000"
+    depends_on:
+      postgres:
+        condition: service_healthy
+    links:
+      - postgres
+    restart: unless-stopped
+    networks:
+      - no-internet
+  postgres:
+    image: postgres:13.3-alpine
+    environment:
+      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${DB_USER}
+      PGUSER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      REQUIRE_CAPTCHA: false
+    ports:
+      - "25565:5432"
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready", "-U", "${DB_USER}", "-d", "${DB_NAME}" ]
+      interval: 2s
+      timeout: 2s
+    restart: unless-stopped
+    networks:
+      - with-internet
+      - no-internet
+
+  gateway:
+    build: GATEWAY/.
+    image: codebattles-gateway
+    ports:
+      - "2500:80"
+    depends_on:
+      - backend
+    restart: unless-stopped
+    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-python:
+    build:
+      dockerfile: z_checkers_dockerfiles/Python.Dockerfile
+    image: codebattles-checker-python
+    restart: unless-stopped
+    networks:
+      - no-internet
+
+#  checker-cpp:
+#    build:
+#      dockerfile: z_checkers_dockerfiles/CPP.Dockerfile
+#    image: codebattles-checker-cpp
+#    restart: unless-stopped
+#  checker-pascal:
+#    build:
+#      dockerfile: z_checkers_dockerfiles/Pascal.Dockerfile
+#    image: codebattles-checker-pascal
+#    restart: unless-stopped
+
+networks:
+  no-internet:
+    driver: bridge
+    internal: true
+  with-internet:
+    driver: bridge
+
+
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index f24b1f6..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-version: "3.9"
-services:
-  frontend-v2:
-    build: FRONTEND_V2/.
-    image: ghcr.io/codebattles-nn/frontend-v2
-    ports:
-      - "8002:80"
-    restart: unless-stopped
-    environment:
-      VITE_ENV: "production"
-
-    networks:
-      - with-internet
-      - no-internet
-
-  backend:
-    build: BACKEND_V2/.
-    image: ghcr.io/codebattles-nn/backend-v2
-    environment:
-      SERVER_PORT: 8000
-      SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/cb
-      SPRING_DATASOURCE_USERNAME: postgres
-      SPRING_DATASOURCE_PASSWORD: admin
-    ports:
-      - "8000:8000"
-    depends_on:
-      postgres:
-        condition: service_healthy
-    links:
-      - postgres
-    restart: unless-stopped
-    networks:
-      - with-internet
-      - no-internet
-      - checkers-net
-  postgres:
-    image: postgres:13.3-alpine
-    environment:
-      POSTGRES_DB: "cb"
-      POSTGRES_USER: "postgres"
-      PGUSER: "postgres"
-      POSTGRES_PASSWORD: "admin"
-      REQUIRE_CAPTCHA: false
-
-    ports:
-      - "25565:5432"
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready", "-U", "postgres", "-d", "cb" ]
-      interval: 2s
-      timeout: 2s
-    restart: unless-stopped
-    networks:
-      - with-internet
-      - no-internet
-
-  gateway:
-    build: GATEWAY/.
-    image: ghcr.io/codebattles-nn/gateway
-    ports:
-      - "2500:80"
-    depends_on:
-      - backend
-    restart: unless-stopped
-    networks:
-      - with-internet
-      - no-internet
-
-  checker-java:
-    build:
-      dockerfile: z_checkers_dockerfiles/Java.Dockerfile
-    image: ghcr.io/codebattles-nn/checker-java
-    restart: unless-stopped
-    networks:
-      - checkers-net
-
-  checker-python:
-    build:
-      dockerfile: z_checkers_dockerfiles/Python.Dockerfile
-    image: ghcr.io/codebattles-nn/checker-python
-    restart: unless-stopped
-    networks:
-      - checkers-net
-
-#  checker-kumir:
-#    build:
-#      dockerfile: z_checkers_dockerfiles/Kumir.Dockerfile
-#    image: ghcr.io/codebattles-nn/checker-kumir
-#    restart: unless-stopped
-#    networks:
-#      - with-internet
-#      - no-internet
-
-
-#  checker-cpp:
-#    build:
-#      dockerfile: ./CPP.Dockerfile
-#    image: ghcr.io/codebattles-nn/checker-cpp
-#    restart: unless-stopped
-#  checker-pascal:
-#    build:
-#      dockerfile: ./Pascal.Dockerfile
-#    image: ghcr.io/codebattles-nn/checker-pascal
-#    restart: unless-stopped
-
-networks:
-  no-internet:
-    driver: bridge
-    internal: true
-  checkers-net:
-    driver: bridge
-    internal: true
-  with-internet:
-    driver: bridge
-
-
diff --git a/test-docker-compose.yml b/test-docker-compose.yml
deleted file mode 100644
index d19fe42..0000000
--- a/test-docker-compose.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-version: "3.9"
-services:
-  frontend:
-    build: FRONTEND/.
-    restart: unless-stopped
-  frontend-v2:
-    build: FRONTEND_V2/.
-    restart: unless-stopped
-  backend:
-    build: BACKEND/.
-    environment:
-      CHECKER_PORT: 7070
-      DB_HOST: postgres
-      DB_USERNAME: "postgres"
-      DB_PASSWORD: "admin"
-      DB_NAME: "cb"
-      HASH_SALT: 4a5ecb2c236d1c4c3e670fcc76b8d1566c94d096bcf5f700511bb039507ad518
-      REDIS_HOST: redis
-      ADMIN_LOGIN: adminnn23
-      ADMIN_PASSWORD: goodprog
-      PYTHONUNBUFFERED: TRUE
-    depends_on:
-      postgres:
-        condition: service_healthy
-    links:
-      - postgres
-    restart: unless-stopped
-    
-  redis:
-    image: redis:alpine3.18
-    restart: unless-stopped
-  postgres:
-    image: postgres:13.3-alpine
-    environment:
-      POSTGRES_DB: "cb"
-      POSTGRES_USER: "postgres"
-      PGUSER: "postgres"
-      POSTGRES_PASSWORD: "admin"
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready", "-U", "postgres", "-d", "cb" ]
-      interval: 2s
-      timeout: 2s
-    restart: unless-stopped
-  gateway:
-    build: GATEWAY/.
-    ports:
-      - "2500:80"
-    depends_on:
-      - frontend
-      - backend
-    restart: unless-stopped
-  init_configurer:
-    build: INIT_CONFIGURER/.
-    environment:
-      DB_HOST: postgres
-      DB_USERNAME: "postgres"
-      DB_PASSWORD: "admin"
-      DB_NAME: "cb"
-    links:
-      - backend
-      - postgres
-    restart: unless-stopped
-  checker-java:
-    build:
-      dockerfile: z_checkers_dockerfiles/Java.Dockerfile
-    restart: unless-stopped
-  checker-python:
-    build:
-      dockerfile: z_checkers_dockerfiles/Python.Dockerfile
-    restart: unless-stopped