Adapt to cookieplone, rename image names

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION} as builder
+FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION} as builder
 
 # Build Volto Project and then remove directories not needed for production
 COPY pnpm-workspace.yaml /app/
@@ -10,7 +10,7 @@ RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     pnpm install --prod
 EOT
 
-FROM plone/frontend-prod-config:${VOLTO_VERSION} as base
+FROM ghcr.io/kitconcept/frontend-prod-config:${VOLTO_VERSION} as base
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-frontend" \

Dockerfile.builder

@@ -17,13 +17,8 @@ RUN <<EOT
 EOT
 
 RUN <<EOT
-    pipx run cookiecutter gh:plone/cookiecutter-volto addon_name=app --no-input
+    pipx run --no-cache cookieplone sub/frontend_project --no_input __version_plone_volto=$VOLTO_VERSION
     chown -R node:node /app
-    cd /app
-    sed -i 's/${VOLTO_VERSION}/'"$VOLTO_VERSION"'/g' mrs.developer.json
-    # Removes the addon dependency from package.json
-    python3 -c "import json; data = json.load(open('package.json')); data['dependencies'].pop(list(data['dependencies'].keys())[-1]); json.dump(data, open('package.json', 'w'), indent=2)"
-    rm -rf packages/app
 EOT
 
 COPY --chown=node:node volto.config.js /app/
@@ -35,6 +30,6 @@ WORKDIR /app
 
 RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     set -e
-    pnpm dlx mrs-developer missdev --no-config --fetch-https
+    git clone -b $VOLTO_VERSION --depth 1 https://github.com/plone/volto core
     pnpm install
 EOT

Dockerfile.dev

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION}
+FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION}
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="frontend-dev" \

Dockerfile.nightly

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:18-slim as base
+FROM node:20-slim as base
 FROM base as builder
 
 
@@ -27,7 +27,7 @@ RUN <<EOT
     rm -rf cache omelette .yarn/cache
 EOT
 
-FROM plone/frontend-prod-config:latest
+FROM ghcr.io/kitconcept/frontend-prod-config:latest
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-frontend" \

Dockerfile.prod

@@ -25,6 +25,7 @@ USER node
 
 # Set working directory to /app
 WORKDIR /app
+RUN corepack use pnpm@9
 
 # Expose default Express port
 EXPOSE 3000

Makefile

@@ -18,8 +18,8 @@ RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
 # Current version
-MAIN_IMAGE_NAME=plone/plone-frontend
-BASE_IMAGE_NAME=plone/frontend
+MAIN_IMAGE_NAME=ghcr.io/kitconcept/plone-frontend
+BASE_IMAGE_NAME=ghcr.io/kitconcept/frontend
 VOLTO_VERSION=$$(cat version.txt)
 IMAGE_TAG=${VOLTO_VERSION}
 NIGHTLY_IMAGE_TAG=nightly

version.txt

@@ -1 +1 @@
-18.0.0-alpha.27
+18.0.0-alpha.31