From 2c2d7eeaa6a80774e4a94c729dd1d4c4eba40ab9 Mon Sep 17 00:00:00 2001 From: Alex-GF Date: Fri, 22 Dec 2023 12:41:43 +0100 Subject: [PATCH] CI/CD: FIX --- server/docker/Dockerfile | 4 +--- terraform/scripts/run-docker.sh | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/docker/Dockerfile b/server/docker/Dockerfile index ca1c7d2..3e5a749 100644 --- a/server/docker/Dockerfile +++ b/server/docker/Dockerfile @@ -7,6 +7,7 @@ WORKDIR /usr/src/server # Copy the rest of the application source code to the container COPY ./server . COPY ./GoogleCloudKey.json .. +COPY ./.env . # Install Node.js dependencies RUN npm install @@ -15,9 +16,6 @@ RUN npm uninstall bcrypt RUN npm install bcrypt -# Define a default environment variable if not provided during runtime -RUN mv .env.prod .env - # Expose a port if your React app runs a server (e.g., for development purposes) # EXPOSE 3000 diff --git a/terraform/scripts/run-docker.sh b/terraform/scripts/run-docker.sh index b7516e6..7945f8c 100644 --- a/terraform/scripts/run-docker.sh +++ b/terraform/scripts/run-docker.sh @@ -1,5 +1,4 @@ -sudo mv /tmp/.env.prod users-microservice/server/.env.prod +sudo mv /tmp/.env.prod users-microservice/.env sudo mv /tmp/GoogleCloudKey.json users-microservice/GoogleCloudKey.json cd users-microservice -source server/.env.prod sudo docker compose up -d \ No newline at end of file