chore: apply suggestions

Applying simplifications and fixed workflow name as per review suggestions.

Signed-off-by: Tim deBoer <git@tdeboer.ca>

Author: deboer-tim

.github/workflows/build-next.yaml

@@ -36,7 +36,7 @@ jobs:
       - name: Check for builder-related changes
         id: check
         run: |
-          if git diff --name-only HEAD^ HEAD | grep -E '^(package.json|pnpm-lock.yaml|build/Containerfile.builder|.github/workflows/next-build.yaml)$'; then
+          if git diff --name-only HEAD^ HEAD | grep -E '^(package.json|pnpm-lock.yaml|build/Containerfile.builder|.github/workflows/build-next.yaml)$'; then
             echo "builder_required=true" >> $GITHUB_OUTPUT
           else
             echo "builder_required=false" >> $GITHUB_OUTPUT

build/Containerfile

@@ -40,14 +40,11 @@ RUN pnpm install && \
 RUN mkdir /opt/app-root/extension && \
       cp -r dist /opt/app-root/extension/ && \
       cp package.json /opt/app-root/extension/ && \
-      cp ./*.png /opt/app-root/extension/
-
-COPY package.json /opt/app-root/extension/
-COPY LICENSE /opt/app-root/extension/
-COPY README.md /opt/app-root/extension/
-COPY icon.png /opt/app-root/extension/
-COPY packages/backend/bootable.woff2 /opt/app-root/extension/
-COPY packages/backend/media/ /opt/app-root/extension/media
+      cp ./*.png /opt/app-root/extension/ && \
+      cp LICENSE /opt/app-root/extension/ && \
+      cp README.md /opt/app-root/extension/ && \
+      cp packages/backend/bootable.woff2 /opt/app-root/extension/ && \
+      cp packages/backend/media/ /opt/app-root/extension/media
 
 # TEMPORARY. Permanent fix will be in the future when we can add all of this to vite script.
 # We require the macadam.js binaries and library, so we will manually copy this over to the container image.

build/Containerfile.builder

@@ -22,9 +22,7 @@ ENV HOME=/opt/app-root
 
 # copy the application files to the /opt/app-root/extension-source directory
 WORKDIR /opt/app-root/extension-source
-RUN mkdir -p /opt/app-root/extension-source
-COPY package.json /opt/app-root/extension-source/
-COPY pnpm-lock.yaml /opt/app-root/extension-source/
+COPY package.json pnpm-lock.yaml /opt/app-root/extension-source/
 
 RUN npm install --global pnpm@10 && \
     pnpm --frozen-lockfile install