From 1ac6b2a526e74dec30927fa7ec76409fce3b0e6f Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Mon, 9 Oct 2023 21:19:34 -0300
Subject: [PATCH] Use a variable to specify API endpoint

---
 .gitlab-ci.yml                                      | 2 +-
 sample-client-users/{Dockerfile => Dockerfile.prod} | 3 ++-
 sample-client-users/Dockerfile.test                 | 3 ++-
 sample-client-users/src/Api.ts                      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename sample-client-users/{Dockerfile => Dockerfile.prod} (72%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2617d8..8750d6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ build-client:
   script:
     - export $(cat context.env | xargs)
 
-    - docker build sample-client-users -t ${CLIENT_PROD_IMAGE_NAME}
+    - docker build sample-client-users -f sample-client-users/Dockerfile.prod -t ${CLIENT_PROD_IMAGE_NAME}
     - docker build sample-client-users -f sample-client-users/Dockerfile.test -t ${CLIENT_TEST_IMAGE_NAME}
 
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
diff --git a/sample-client-users/Dockerfile b/sample-client-users/Dockerfile.prod
similarity index 72%
rename from sample-client-users/Dockerfile
rename to sample-client-users/Dockerfile.prod
index 12fc50c..d1c093d 100644
--- a/sample-client-users/Dockerfile
+++ b/sample-client-users/Dockerfile.prod
@@ -1,4 +1,5 @@
 FROM node:17.9.1 AS app
+ENV REACT_APP_ENDPOINT "https://api.fids.slc.ar/"
 WORKDIR /app
 COPY . .
 RUN npm install && npm run build
@@ -9,4 +10,4 @@ RUN rm -rf ./*
 COPY --from=app /app/build .
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+ENTRYPOINT ["nginx", "-g", "daemon off;"]
diff --git a/sample-client-users/Dockerfile.test b/sample-client-users/Dockerfile.test
index 113a4f3..775d2c1 100644
--- a/sample-client-users/Dockerfile.test
+++ b/sample-client-users/Dockerfile.test
@@ -1,4 +1,5 @@
 FROM node:17.9.1 AS app
+ENV REACT_APP_ENDPOINT "http://127.0.0.1:5000/"
 WORKDIR /app
 COPY package.json .
 COPY package-lock.json .
@@ -6,4 +7,4 @@ RUN npm install
 
 COPY . .
 RUN chmod +x /app/test.sh
-ENTRYPOINT ["/app/test.sh"]
\ No newline at end of file
+ENTRYPOINT ["/app/test.sh"]
diff --git a/sample-client-users/src/Api.ts b/sample-client-users/src/Api.ts
index 3da7d2f..11713e8 100644
--- a/sample-client-users/src/Api.ts
+++ b/sample-client-users/src/Api.ts
@@ -2,7 +2,7 @@ import { Axios, AxiosError } from "axios";
 import { Credentials, Token, User, Zone } from "./Types";
 
 const instance = new Axios({
-	baseURL: "http://127.0.0.1:5000/",
+	baseURL: process.env.REACT_APP_ENDPOINT,
 	headers: {
 		accept: "application/json",
 		"Content-Type": "application/json",