Rolling back to dev and SPIRE health check time automation (#206)

* rolled back to dev mode and spirehealth check time automation Signed-off-by: Mohammed Abdi <[email protected]> * update documentation Signed-off-by: Mohammed Abdi <[email protected]> --------- Signed-off-by: Mohammed Abdi <[email protected]>
spiffe · May 11, 2023 · 4744a09 · 4744a09
1 parent 03fc5eb
commit 4744a09
Show file tree

Hide file tree

Showing 15 changed files with 396 additions and 850 deletions.
diff --git a/Dockerfile.frontend-container b/Dockerfile.frontend-container
@@ -1,48 +1,19 @@
-# Build stage
-FROM node:16-alpine3.14 AS build
+FROM node:16-alpine
 
 WORKDIR /usr/src/app
 
 COPY tornjak-frontend .
 
-RUN npm install --omit=dev && \
-    npm run build
+RUN npm install --omit=dev
 
-# Runtime stage
-FROM node:16-alpine3.14 AS runtime
-
-WORKDIR /usr/src/app
-
-COPY --from=build /usr/src/app/build .
-COPY --from=build /usr/src/app/.env.prod .
-
-# install serve package
-RUN npm install -g serve
+RUN npm prune --production
 
 # set env variables
-ARG REACT_APP_API_SERVER_URI
-ARG REACT_APP_AUTH_SERVER_URI
-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_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
 
 ENV PORT_FE=3000
 EXPOSE $PORT_FE
 
-# CMD ["serve", "-s", "."]
-# CMD ["sh", "-c", "PORT=$PORT_FE serve -s build"]
-# CMD ["npm", "start"]
-
-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_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
+CMD ["npm", "start"]
diff --git a/USAGE.md b/USAGE.md
@@ -50,14 +50,13 @@ The frontend is meant to connect to either the Tornjak backend or the Tornjak ma
 | `REACT_APP_AUTH_SERVER_URI` | URI for the Keycloak instance to obtain access tokens |  | `http://localhost:8080` | false |
 | `PORT_FE` | Port for the frontend to run | `3000` | `3000` | true |
 | `PORT_BE` | Port for the backend to run | `10000` | `10000` | true |
-| `REACT_APP_SPIRE_HEALTH_CHECK` | Enable SPIRE health check component | `true` | `true` | false |
-| `REACT_APP_SPIRE_HEALTH_CHECK_TIME` | Set how often SPIRE health should be checked, if component enabled | `120` | `240` | false |
+| `REACT_APP_SPIRE_HEALTH_CHECK_ENABLE` | Enable SPIRE health check component | `false` | `true` | false |
 
 ```
-docker run -p 3000:8080 -e REACT_APP_API_SERVER_URI='http://localhost:50000' -e REACT_APP_TORNJAK_MANAGER=true -e PORT_FE-8080 -e REACT_APP_SPIRE_HEALTH_CHECK=true -e REACT_APP_SPIRE_HEALTH_CHECK_TIME=120 ghcr.io/spiffe/tornjak-frontend:latest
+docker run -p 3000:8080 -e REACT_APP_API_SERVER_URI='http://localhost:50000' -e REACT_APP_TORNJAK_MANAGER=true -e PORT_FE-8080 -e REACT_APP_SPIRE_HEALTH_CHECK=true ghcr.io/spiffe/tornjak-frontend:latest
 ```
 
-The above command is an example of how to run the frontend. This creates a UI available at http://localhost:3000 forwarded from container port `8080`. It is listening to a Tornjak manager component available at http://localhost:50000, and knows to run in manager mode with the `REACT_APP_TORNJAK_MANAGER` flag. The last two environment variables namely, [`REACT_APP_SPIRE_HEALTH_CHECK` & `REACT_APP_SPIRE_HEALTH_CHECK_TIME`] are used to enable the SPIRE health check component and set how often it should be checked respectively. 
+The above command is an example of how to run the frontend. This creates a UI available at http://localhost:3000 forwarded from container port `8080`. It is listening to a Tornjak manager component available at http://localhost:50000, and knows to run in manager mode with the `REACT_APP_TORNJAK_MANAGER` flag. The last environment variables namely, `REACT_APP_SPIRE_HEALTH_CHECK_ENABLE` is used to enable the SPIRE health check component. 
 
 ## Tornjak
 

diff --git a/docker-compose-frontend.yml b/docker-compose-frontend.yml
@@ -12,5 +12,4 @@ 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_ENABLE=false
-      # - REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
+      - REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
diff --git a/tornjak-frontend/.env b/tornjak-frontend/.env
@@ -13,6 +13,4 @@ REACT_APP_API_SERVER_URI=http://localhost:10000/
 
 
 ##### To check SPIRE health #####
-REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
-# REACT_APP_SPIRE_HEALTH_CHECK_TIME is in seconds
-REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
+REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
diff --git a/tornjak-frontend/.env.prod b/tornjak-frontend/.env.prod
@@ -8,6 +8,4 @@ REACT_APP_API_SERVER_URI=http://localhost:10000/
 
 
 ##### To check SPIRE health #####
-REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
-# REACT_APP_SPIRE_HEALTH_CHECK_TIME is in seconds
-REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
+REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
diff --git a/tornjak-frontend/.env.staging b/tornjak-frontend/.env.staging
@@ -1,6 +1,4 @@
 REACT_APP_API_SERVER_URI=http://localhost:10000/ 
-REACT_APP_AUTH_SERVER_URI=http://localhost:8080/
+#REACT_APP_AUTH_SERVER_URI=http://localhost:8080/
 ##### To check SPIRE health #####
-REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false
-# REACT_APP_SPIRE_HEALTH_CHECK_TIME is in seconds
-REACT_APP_SPIRE_HEALTH_CHECK_FREQ_SEC=120
+REACT_APP_SPIRE_HEALTH_CHECK_ENABLE=false