CI/CD: FIX

fis-g4 · Dec 22, 2023 · 2c2d7ee · 2c2d7ee
1 parent 93e3849
commit 2c2d7ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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