DESENG-820 Hotfix: Update docker build process

Author: NatSquared

.github/workflows/met-api-cd.yml

@@ -60,9 +60,9 @@ jobs:
 
       - name: Build image
         run: |
-          docker build . --file Dockerfile \
+          TZ='America/Vancouver' docker build . --file Dockerfile \
             --build-arg MET_BUILD_COMMIT_HASH=${{ github.sha }} \
-            --build-arg MET_BUILD_DATE="$(date -u +'%b %d, %Y @ %H:%M')" \
+            --build-arg MET_BUILD_DATE="$(date +'%b %d, %Y @ %H:%M')" \
             --build-arg MET_BUILD_BRANCH=${{ github.ref_name }} \
             --build-arg MET_GITHUB_REPO="https://github.com/${{ github.repository }}" \
             --tag image

.github/workflows/met-web-cd.yml

@@ -70,11 +70,11 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
         run: |
-          docker build . --file Dockerfile \
+          TZ='America/Vancouver' docker build . --file Dockerfile \
             --secret id=artifactory_username,src=/tmp/artifactory_username \
             --secret id=artifactory_password,src=/tmp/artifactory_password \
             --build-arg REACT_APP_BUILD_COMMIT_HASH=${{ github.sha }} \
-            --build-arg REACT_APP_BUILD_DATE="$(date -u +'%b %d, %Y @ %H:%M')" \
+            --build-arg REACT_APP_BUILD_DATE="$(date +'%b %d, %Y @ %H:%M')" \
             --build-arg REACT_APP_BUILD_BRANCH=${{ github.ref_name }} \
             --build-arg REACT_APP_GITHUB_REPO="https://github.com/${{ github.repository }}" \
             --tag image

met-web/Dockerfile

@@ -2,6 +2,18 @@
 # pull official base image
 FROM node:20-alpine AS build-stage
 
+# Accept build arguments for version information to pass to runtime
+ARG REACT_APP_BUILD_COMMIT_HASH=dev
+ARG REACT_APP_BUILD_DATE=unknown
+ARG REACT_APP_BUILD_BRANCH=unknown
+ARG REACT_APP_GITHUB_REPO=https://github.com/bcgov/met-public
+
+# Set as environment variables for runtime access
+ENV REACT_APP_BUILD_COMMIT_HASH=${REACT_APP_BUILD_COMMIT_HASH}
+ENV REACT_APP_BUILD_DATE=${REACT_APP_BUILD_DATE}
+ENV REACT_APP_BUILD_BRANCH=${REACT_APP_BUILD_BRANCH}
+ENV REACT_APP_GITHUB_REPO=${REACT_APP_GITHUB_REPO}
+
 # set working directory
 WORKDIR /app
 
@@ -32,18 +44,6 @@ RUN npm run build
 # Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
 FROM nginx:1.17 AS production-stage
 
-# Accept build arguments for version information to pass to runtime
-ARG REACT_APP_BUILD_COMMIT_HASH=dev
-ARG REACT_APP_BUILD_DATE=unknown
-ARG REACT_APP_BUILD_BRANCH=unknown
-ARG REACT_APP_GITHUB_REPO=https://github.com/bcgov/met-public
-
-# Set as environment variables for runtime access
-ENV REACT_APP_BUILD_COMMIT_HASH=${REACT_APP_BUILD_COMMIT_HASH}
-ENV REACT_APP_BUILD_DATE=${REACT_APP_BUILD_DATE}
-ENV REACT_APP_BUILD_BRANCH=${REACT_APP_BUILD_BRANCH}
-ENV REACT_APP_GITHUB_REPO=${REACT_APP_GITHUB_REPO}
-
 RUN mkdir /app
 
 # RUN  touch /var/run/nginx.pid && \