Hotfix: Web CD workflow

Author: NatSquared

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

@@ -74,6 +74,7 @@ jobs:
         run: |
           export TZ='America/Vancouver' && 
             docker build . --file Dockerfile \
+            --build-context common_hosted_form_service=../common-hosted-form-service \
             --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 }} \

web/Dockerfile

@@ -14,16 +14,17 @@ 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
+# set working directory to preserve the repo-relative local dependency path
+WORKDIR /app/web
 
-# add `/app/node_modules/.bin` to $PATH
-ENV PATH=/app/node_modules/.bin:$PATH
+# add the web app binaries to $PATH
+ENV PATH=/app/web/node_modules/.bin:$PATH
 
 # install app dependencies using BuildKit secrets for Artifactory credentials
 COPY package.json ./
 COPY package-lock.json ./
 COPY .npmrc ./
+COPY --from=common_hosted_form_service /components /app/common-hosted-form-service/components
 
 RUN --mount=type=secret,id=artifactory_password \
     --mount=type=secret,id=artifactory_username \
@@ -51,7 +52,7 @@ RUN mkdir /app
 ARG user=nginx
 RUN usermod -a -G root $user
 
-COPY --from=build-stage /app/build /usr/share/nginx/html
+COPY --from=build-stage /app/web/build /usr/share/nginx/html
 COPY /nginx/*.conf /etc/nginx/
 COPY /nginx/docker-entrypoint.sh /
 COPY /nginx/config.js.template /usr/share/nginx/html/config.js.template