Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Renaming health check env variables #196

Merged
merged 3 commits into from
May 8, 2023
Merged

Renaming health check env variables #196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffb2465
update env variables and upgrade react scripts
mamy-CS May 4, 2023
4552bb5
upgrading depreciated packages
mamy-CS May 8, 2023
41fa0e4
moving from ci to install
mamy-CS May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Dockerfile.frontend-container
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ RUN npm install -g serve
# set env variables
ARG REACT_APP_API_SERVER_URI
ARG REACT_APP_AUTH_SERVER_URI
ARG REACT_APP_SPIRE_HEALTH_CHECK
ARG REACT_APP_SPIRE_HEALTH_CHECK_TIME
ARG REACT_APP_SPIRE_HEALTH_CHECK_ENABLE
ARG REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC

ENV REACT_APP_API_SERVER_URI $REACT_APP_API_SERVER_URI
ENV REACT_APP_AUTH_SERVER_URI $REACT_APP_AUTH_SERVER_URI
ENV REACT_APP_SPIRE_HEALTH_CHECK $REACT_APP_SPIRE_HEALTH_CHECK
ENV REACT_APP_SPIRE_HEALTH_CHECK_TIME $REACT_APP_SPIRE_HEALTH_CHECK_TIME
ENV REACT_APP_SPIRE_HEALTH_CHECK_ENABLE $REACT_APP_SPIRE_HEALTH_CHECK_ENABLE
ENV REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC $REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC
# ENV NODE_OPTIONS $NODE_OPTIONS
# ARG NODE_OPTIONS=--openssl-legacy-provider

Expand All @@ -43,6 +43,6 @@ CMD serve -s . -p $PORT_FE

# CMD REACT_APP_API_SERVER_URI=$REACT_APP_API_SERVER_URI \
# REACT_APP_AUTH_SERVER_URI=$REACT_APP_AUTH_SERVER_URI \
# REACT_APP_SPIRE_HEALTH_CHECK=$REACT_APP_SPIRE_HEALTH_CHECK \
# REACT_APP_SPIRE_HEALTH_CHECK_TIME=$REACT_APP_SPIRE_HEALTH_CHECK_TIME \
# serve -s . -p $PORT_FE
# REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=$REACT_APP_SPIRE_HEALTH_CHECK_ENABLE \
# REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=$REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC \
# serve -s . -p $PORT_FE
4 changes: 2 additions & 2 deletions docker-compose-frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ services:
- "PORT_FE=8080"
- "REACT_APP_API_SERVER_URI=http://localhost:10000"
# - "REACT_APP_AUTH_SERVER_URI=http://localhost:8080"
- "REACT_APP_SPIRE_HEALTH_CHECK=false"
# - "REACT_APP_SPIRE_HEALTH_CHECK_TIME=120"
- REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
# - REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
6 changes: 4 additions & 2 deletions tornjak-frontend/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
############### Default settings ###############
# Note: Temporarily to suppress warrnings after reactscript upgarde, not a permanent fix
GENERATE_SOURCEMAP=false
NODE_PATH=src/
SKIP_PREFLIGHT_CHECK=true
REACT_APP_DEBUG_TORNJAK=true
Expand All @@ -11,6 +13,6 @@ REACT_APP_API_SERVER_URI=http://localhost:10000/


##### To check SPIRE health #####
REACT_APP_SPIRE_HEALTH_CHECK=true
REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
# REACT_APP_SPIRE_HEALTH_CHECK_TIME is in seconds
REACT_APP_SPIRE_HEALTH_CHECK_TIME=120
REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
4 changes: 2 additions & 2 deletions tornjak-frontend/.env.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ REACT_APP_API_SERVER_URI=http://localhost:10000/


##### To check SPIRE health #####
REACT_APP_SPIRE_HEALTH_CHECK=true
REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
# REACT_APP_SPIRE_HEALTH_CHECK_TIME is in seconds
REACT_APP_SPIRE_HEALTH_CHECK_TIME=120
REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
4 changes: 2 additions & 2 deletions tornjak-frontend/.env.staging
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
REACT_APP_API_SERVER_URI=http://localhost:10000/
REACT_APP_AUTH_SERVER_URI=http://localhost:8080/
##### To check SPIRE health #####
REACT_APP_SPIRE_HEALTH_CHECK=true
REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
# REACT_APP_SPIRE_HEALTH_CHECK_TIME is in seconds
REACT_APP_SPIRE_HEALTH_CHECK_TIME=120
REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
Loading