From 0b9206e9f6c27d19043a5bad13e03a9b260d66c0 Mon Sep 17 00:00:00 2001
From: Tudor Amariei <tudor.amariei@commitglobal.org>
Date: Wed, 27 Mar 2024 11:52:17 +0200
Subject: [PATCH] Fix the production docker configuration

---
 docker-compose.prod.yml                |  5 ++--
 docker-compose.test.yml                | 39 --------------------------
 docker/dockerfiles/Dockerfile.backend  |  2 +-
 docker/dockerfiles/Dockerfile.frontend |  4 +--
 4 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 docker-compose.test.yml

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 298a4e9e..1635bc49 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-name: seismic_multi
+name: seismic_prod
 
 services:
 
@@ -9,10 +9,10 @@ services:
     container_name: seismic_db
 
   backend:
-    container_name: seismic_backend
     extends:
       file: docker-compose.base.yml
       service: backend_base
+    container_name: seismic_backend
     build:
       context: .
       dockerfile: ./docker/dockerfiles/Dockerfile.backend
@@ -25,6 +25,7 @@ services:
     extends:
       file: docker-compose.base.yml
       service: client_base
+    container_name: seismic_client
     build:
       context: ./
       dockerfile: ./docker/dockerfiles/Dockerfile.frontend
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
deleted file mode 100644
index cf0494d5..00000000
--- a/docker-compose.test.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-version: "3.8"
-name: seismic-prod
-
-services:
-
-  db:
-    container_name: seismic_db-prod
-    extends:
-      file: dk-cp.base.yml
-      service: db_base
-
-  api:
-    container_name: seismic_api-prod
-    extends:
-      file: dk-cp.base.yml
-      service: api_base
-    image: ghcr.io/code4romania/seismic-risc-backend:edge
-    env_file:
-      - .env.prod
-    environment:
-      ENVIRONMENT: "production"
-
-  client:
-    container_name: seismic_client-prod
-    extends:
-      file: dk-cp.base.yml
-      service: client_base
-    image: ghcr.io/code4romania/seismic-risc-frontend:edge
-    env_file:
-      - .env.prod
-    environment:
-      ENVIRONMENT: "production"
-    ports:
-      - "${CLIENT_PORT:-3030}:80"
-
-volumes:
-    pgdata:
-        name: seismic_pgdata-prod
-
diff --git a/docker/dockerfiles/Dockerfile.backend b/docker/dockerfiles/Dockerfile.backend
index 06e0bd10..e493847e 100644
--- a/docker/dockerfiles/Dockerfile.backend
+++ b/docker/dockerfiles/Dockerfile.backend
@@ -21,7 +21,7 @@ RUN python3 -m pip install --upgrade pip setuptools && \
     python3 -m pip install -r ./requirements.txt
 
 
-FROM python:v${PYTHON_VERSION}-slim-bookworm
+FROM python:${PYTHON_VERSION}-slim-bookworm
 
 ENV PYTHONUNBUFFERED=1
 
diff --git a/docker/dockerfiles/Dockerfile.frontend b/docker/dockerfiles/Dockerfile.frontend
index af4f26ce..97c8749c 100644
--- a/docker/dockerfiles/Dockerfile.frontend
+++ b/docker/dockerfiles/Dockerfile.frontend
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=20.11.1
+ARG NODE_VERSION=18.19.1
 ARG NGINX_VERSION=1.25.4
 
 FROM node:${NODE_VERSION}-bookworm-slim as frontend
@@ -16,7 +16,7 @@ ENV REACT_APP_DJANGO_API_ENDPOINT ${REACT_APP_DJANGO_API_ENDPOINT}
 
 WORKDIR /var/www/seismic/frontend
 
-COPY ./ .
+COPY ./client/ ./
 
 # install the frontend libraries:
 RUN npm ci && \