Merge pull request #58 from plone/useofficialpnpmimages

Use the official `pnpm` based images
plone · Sep 16, 2024 · fa4eb18 · fa4eb18
2 parents a23d708 + 5898240
commit fa4eb18
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile
@@ -1,9 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-# TODO: Replace with
-# FROM plone/frontend-builder:${VOLTO_VERSION}
-# when the main image is ready
-FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION} as builder
+FROM plone/frontend-builder:${VOLTO_VERSION} as builder
 
 COPY --chown=node packages/{{cookiecutter.frontend_addon_name}} /app/packages/{{cookiecutter.frontend_addon_name}}
 COPY --chown=node volto.config.js /app/
@@ -17,10 +14,7 @@ RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
      pnpm install --prod
 EOT
 
-# TODO: Replace with
-# FROM plone/frontend-prod-config:${VOLTO_VERSION}
-# when the main image is ready
-FROM ghcr.io/kitconcept/frontend-prod-config:${VOLTO_VERSION}
+FROM plone/frontend-prod-config:${VOLTO_VERSION}
 
 LABEL maintainer="{{ cookiecutter.author }} <{{ cookiecutter.email }}>" \
       org.label-schema.name="{{ cookiecutter.project_slug }}-frontend" \