Añade cambios extras para que funcione el despliegue

Arquisoft · Apr 4, 2022 · 2af0ec1 · 2af0ec1
1 parent f65bde2
commit 2af0ec1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/asw2122.yml b/.github/workflows/asw2122.yml
@@ -45,6 +45,8 @@ jobs:
     - run: npm --prefix webapp run test:e2e
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
+    env:
+      API_URI: http://${{ secrets.DEPLOY_HOST }}:5000/api
     runs-on: ubuntu-latest
     needs: [e2e-tests]
     steps:

diff --git a/restapi/server.ts b/restapi/server.ts
@@ -30,7 +30,8 @@ app.use(expressSession({
 const metricsMiddleware:RequestHandler = promBundle({includeMethod: true});
 app.use(metricsMiddleware);
 
-app.use(cors(options));
+//app.use(cors(options));
+app.use(cors())
 app.use(bp.json());
 
 app.use("/api", api);

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
@@ -6,6 +6,8 @@ WORKDIR /app
 RUN npm install
 
 #Create an optimized version of the webapp
+ARG API_URI="http://localhost:5000/api"
+ENV REACT_APP_API_URI=$API_URI
 RUN npm run build
 
 #Ver como podemos llamar npm run prod aquí