slococo
/
fids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bugs

This commit is contained in:
Santiago Lo Coco 2023-10-25 12:26:55 -03:00
parent 427e7bd989
commit 0e89fe1b15
9 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -91,7 +91,7 @@ build-browser-client:
script:
- export $(cat context.env | xargs)
- docker build browser-domain -f browser-domain/Dockerfile.prod -t ${BROWSER_CLIENT_PROD_IMAGE_NAME}
- docker build browser-domain -f browser-domain/Dockerfile.prod --build-arg "REACT_APP_ENDPOINT=https://api.fids.slc.ar/" -t ${BROWSER_CLIENT_PROD_IMAGE_NAME}
- docker build browser-domain -f browser-domain/Dockerfile.test -t ${BROWSER_CLIENT_TEST_IMAGE_NAME}
- docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
@ -109,7 +109,7 @@ build-screen-client:
script:
- export $(cat context.env | xargs)
- docker build screen-domain -f screen-domain/Dockerfile.prod -t ${SCREEN_CLIENT_PROD_IMAGE_NAME}
- docker build screen-domain -f screen-domain/Dockerfile.prod --build-arg "REACT_APP_ENDPOINT=https://api.fids.slc.ar/" --build-arg "REACT_APP_ORIGIN=Frankfurt" -t ${SCREEN_CLIENT_PROD_IMAGE_NAME}
- docker build screen-domain -f screen-domain/Dockerfile.test -t ${SCREEN_CLIENT_TEST_IMAGE_NAME}
- docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY

2
browser-domain/docker-compose.yml
View File

@ -5,8 +5,6 @@ services:
container_name: fids_browser_client
image: ${CLIENT_IMAGE}
restart: always
ports:
- 8080:80
environment:
- API_HOST=api
network_mode: host

2
browser-domain/src/Api.ts
View File

@ -2,7 +2,7 @@ import { Axios, AxiosError } from "axios";
import { Credentials, Token, User, Flight, FlightCreate } from "./Types";
const instance = new Axios({
baseURL: "http://127.0.0.1:5002/",
baseURL: process.env.REACT_APP_ENDPOINT ? process.env.REACT_APP_ENDPOINT : "http://127.0.0.1:5000/",
headers: {
accept: "application/json",
"Content-Type": "application/json",

1
flights-domain/flights-information/src/api/main.py
View File

@ -12,6 +12,7 @@ app.include_router(health.router, prefix="/health")
app.add_middleware(
CORSMiddleware,
allow_origins=[
"https://fids.slc.ar",
"https://fids.slc.ar",
"http://localhost:8080",
"http://localhost:8081",

4
run.sh
View File

@ -92,7 +92,7 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
fi
;;
'screen')
docker build screen-domain -f screen-domain/Dockerfile.prod -t $USER/screen-client:prod
docker build screen-domain -f screen-domain/Dockerfile.prod --build-arg "REACT_APP_ORIGIN=$REACT_APP_ORIGIN" -t $USER/screen-client:prod
export CLIENT_IMAGE=$USER/screen-client:prod
docker compose -f screen-domain/docker-compose.yml up -d
;;
@ -122,7 +122,7 @@ else
docker build $FLIGHTS_INFORMATION -f $FLIGHTS_INFORMATION/Dockerfile.prod -t $USER/flights-information:prod
docker build gateway -f gateway/Dockerfile.prod -t $USER/gateway:prod
docker build screen-domain -f screen-domain/Dockerfile.prod -t $USER/screen-client:prod
docker build screen-domain -f screen-domain/Dockerfile.prod --build-arg "REACT_APP_ORIGIN=$REACT_APP_ORIGIN" -t $USER/screen-client:prod
docker build browser-domain -f browser-domain/Dockerfile.prod -t $USER/browser-client:prod
export API_IMAGE=$USER/flights-information:prod

2
screen-domain/Dockerfile.prod
View File

@ -7,6 +7,8 @@ COPY . .
ARG REACT_APP_ENDPOINT
ENV REACT_APP_ENDPOINT $REACT_APP_ENDPOINT
ARG REACT_APP_ORIGIN
ENV REACT_APP_ORIGIN $REACT_APP_ORIGIN
RUN npm run build

1
screen-domain/Dockerfile.test
View File

@ -1,5 +1,4 @@
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 .

2
screen-domain/docker-compose.yml
View File

@ -5,8 +5,6 @@ services:
container_name: fids_screens_client
image: ${CLIENT_IMAGE}
restart: always
ports:
- 8080:80
environment:
- API_HOST=api
network_mode: host

2
screen-domain/src/Api.ts
View File

@ -2,7 +2,7 @@ import { Axios, AxiosError } from "axios";
import { Credentials, User, Flight } from "./Types";
const instance = new Axios({
baseURL: process.env.REACT_APP_ENDPOINT ? process.env.REACT_APP_ENDPOINT : "http://127.0.0.1:5002/",
baseURL: process.env.REACT_APP_ENDPOINT ? process.env.REACT_APP_ENDPOINT : "http://127.0.0.1:5000/",
headers: {
accept: "application/json",
"Content-Type": "application/json",