Update frontend dockerfile, deploy workflow, and pr-open workflow.

bcgov · Sep 26, 2024 · efc8b4b · efc8b4b
1 parent b0d44b1
commit efc8b4b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -54,17 +54,6 @@ jobs:
     # environment: ${{ inputs.environment }}
     runs-on: ubuntu-latest
     steps:
-      # - name: Deploy Frontend
-      #   uses: bcgov-nr/[email protected]
-      #   with:
-      #     oc_namespace: ${{ vars.OC_NAMESPACE }}
-      #     oc_server: ${{ vars.OC_SERVER }}
-      #     oc_token: ${{ secrets.OC_TOKEN }}
-      #     file: frontend/openshift.deploy.yml
-      #     overwrite: true
-      #     parameters:
-      #       -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }}
-
       - name: Database
         uses: bcgov-nr/[email protected]
         with:
@@ -128,3 +117,19 @@ jobs:
                 -p ENABLE_AQUIFERS_SEARCH=${{ vars.ENABLE_AQUIFERS_SEARCH }}
                 -p EMAIL_NOTIFICATION_RECIPIENT=${{ vars.EMAIL_NOTIFICATION_RECIPIENT }}
                 -p GEOCODER_ADDRESS_API_BASE=${{ vars.GEOCODER_ADDRESS_API_BASE }}
+
+  frontend: 
+    name: Frontend
+    needs: [ init, database, backend ]
+    # environment: ${{ inputs.environment }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy Frontend
+        uses: bcgov-nr/[email protected]
+        with:
+            oc_namespace: ${{ vars.OC_NAMESPACE }}
+            oc_server: ${{ vars.OC_SERVER }}
+            oc_token: ${{ secrets.OC_TOKEN }}
+            file: frontend/openshift.deploy.yml
+            with:
+              -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }}
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: [database, backend]
+        package: [database, backend, frontend]
     timeout-minutes: 20
     steps:
       - uses: bcgov-nr/[email protected]

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -22,4 +22,4 @@ FROM node:14.21.3
 
 COPY --from=build /app /app
 
-# CMD ["npm run serve"]
+CMD ["npm" "run" "serve"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ FROM node:14.21.3

		COPY --from=build /app /app

		# CMD ["npm run serve"]
		CMD ["npm" "run" "serve"]
Check warning on line 25 in frontend/Dockerfile View workflow job for this annotation GitHub Actions / Builds (frontend) JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals `JSONArgsRecommended: JSON arguments recommended for CMD to prevent unintended behavior related to OS signals More info: https://docs.docker.com/go/dockerfile/rule/json-args-recommended/`