Merge pull request #304 from plone/fixDockerfilebuild

Fix dockerfilebuild

Author: sneridagh

.github/workflows/main.yml

@@ -138,7 +138,7 @@ jobs:
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('volto-add-on/package.json','volto-add-on/mrs.developer.json') }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('volto-add-on/pnpm-lock.yaml', 'volto-add-on/package.json','volto-add-on/mrs.developer.json') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
@@ -147,13 +147,19 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/Cypress
-          key: binary-${{ env.node-version }}-${{ hashFiles('volto-add-on/package.json','volto-add-on/mrs.developer.json') }}
+          key: Cypress-binary-${{ env.node-version }}-${{ hashFiles('volto-add-on/pnpm-lock.yaml', 'volto-add-on/package.json','volto-add-on/mrs.developer.json') }}
 
       - name: Install generated package
         working-directory: ${{ env.name }}
         run: |
           make install
 
+      - name: Install Cypress if not in cache
+        if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
+        working-directory: ${{ env.name }}
+        shell: bash
+        run: 'NODEBIN=$(pnpm bin) && $NODEBIN/cypress install'
+
       - name: Run unit tests
         working-directory: ${{ env.name }}
         run: |
@@ -261,13 +267,19 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/Cypress
-          key: binary-${{ env.node-version-prerelease }}-${{ hashFiles('volto-add-on/package.json','volto-add-on/mrs.developer.json') }}
+          key: Cypress-binary-${{ env.node-version }}-${{ hashFiles('volto-add-on/pnpm-lock.yaml', 'volto-add-on/package.json','volto-add-on/mrs.developer.json') }}
 
       - name: Install generated package
         working-directory: ${{ env.name }}
         run: |
           make install
 
+      - name: Install Cypress if not in cache
+        if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
+        working-directory: ${{ env.name }}
+        shell: bash
+        run: 'NODEBIN=$(pnpm bin) && $NODEBIN/cypress install'
+
       - name: Run unit tests
         working-directory: ${{ env.name }}
         run: |

news/+pnpm10build.bugfix

@@ -0,0 +1 @@
+Fixed Dockerfile build command because pnpm complains about ERR_PNPM_ABORTED_REMOVE_MODULES_DIR_NO_TTY. @sneridagh

templates/add-ons/seven_addon/{{ cookiecutter.__folder_name }}/Dockerfile

@@ -17,7 +17,9 @@ RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     (cd core && git fetch --depth 1 origin seven:seven && git checkout seven)
     pnpm install && make build-deps
     pnpm build
-    pnpm install --prod
+    # This is necessary because the build is trying to recreate the node_modules folder
+    # by telling it to CI=1 it will just recreate them
+    CI=1 pnpm install --prod
 EOT
 
 FROM plone/frontend-prod-config:${VOLTO_VERSION}

templates/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile

@@ -16,7 +16,9 @@ RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     pnpm dlx mrs-developer missdev --no-config --fetch-https
     pnpm install && pnpm build:deps
     pnpm build
-    pnpm install --prod
+    # This is necessary because the build is trying to recreate the node_modules folder
+    # by telling it to CI=1 it will just recreate them
+    CI=1 pnpm install --prod
 EOT
 
 FROM plone/frontend-prod-config:${VOLTO_VERSION}