From be780292fb666bc16dec469a4d6dd4e24b03f2c9 Mon Sep 17 00:00:00 2001
From: Victor Fernandez de Alba <sneridagh@gmail.com>
Date: Tue, 26 Mar 2024 09:03:10 +0100
Subject: [PATCH 1/2] New project-less image build

---
 Makefile                 | 15 +++++++++++++++
 next/.npmrc              |  6 ++++++
 next/Dockerfile          | 19 +++++++++++++++++++
 next/Dockerfile.builder  | 39 +++++++++++++++++++++++++++++++++++++++
 next/Dockerfile.prod     | 39 +++++++++++++++++++++++++++++++++++++++
 next/mrs.developer.json  |  9 +++++++++
 next/package.json        | 13 +++++++++++++
 next/pnpm-workspace.yaml |  6 ++++++
 next/volto.config.js     |  7 +++++++
 9 files changed, 153 insertions(+)
 create mode 100644 next/.npmrc
 create mode 100644 next/Dockerfile
 create mode 100644 next/Dockerfile.builder
 create mode 100644 next/Dockerfile.prod
 create mode 100644 next/mrs.developer.json
 create mode 100644 next/package.json
 create mode 100644 next/pnpm-workspace.yaml
 create mode 100644 next/volto.config.js

diff --git a/Makefile b/Makefile
index 9c1804b..37b1bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,11 @@ image-builder:  ## Build Base Image
 	@echo "Building $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG)"
 	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG) -f Dockerfile.builder --load
 
+.PHONY: image-builder-next
+image-builder-next:  ## Build Base Image
+	@echo "Building $(BASE_IMAGE_NAME)-builder-next:$(IMAGE_TAG)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-builder-next:$(IMAGE_TAG) -f next/Dockerfile.builder --load
+
 .PHONY: image-dev
 image-dev:  ## Build Dev Image
 	@echo "Building $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)"
@@ -78,11 +83,21 @@ image-prod-config:  ## Build Prod Image
 	@echo "Building $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)"
 	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG) -f Dockerfile.prod --load
 
+.PHONY: image-prod-config-next
+image-prod-config-next:  ## Build Prod Image
+	@echo "Building $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-prod-config-next:$(IMAGE_TAG) -f next/Dockerfile.prod --load
+
 .PHONY: image-main
 image-main:  ## Build main image
 	@echo "Building $(MAIN_IMAGE_NAME):$(IMAGE_TAG)"
 	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile --load
 
+.PHONY: image-main-next
+image-main-next:  ## Build main image
+	@echo "Building $(MAIN_IMAGE_NAME):$(IMAGE_TAG)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG) -f next/Dockerfile --load
+
 .PHONY: image-nightly
 image-nightly:  ## Build Docker Image Nightly
 	@echo "Building $(MAIN_IMAGE_NAME):$(NIGHTLY_IMAGE_TAG)"
diff --git a/next/.npmrc b/next/.npmrc
new file mode 100644
index 0000000..71c6843
--- /dev/null
+++ b/next/.npmrc
@@ -0,0 +1,6 @@
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*
+public-hoist-pattern[]=*stylelint*
+public-hoist-pattern[]=*cypress*
+public-hoist-pattern[]=*process*
+public-hoist-pattern[]=*parcel*
diff --git a/next/Dockerfile b/next/Dockerfile
new file mode 100644
index 0000000..9b0ffb0
--- /dev/null
+++ b/next/Dockerfile
@@ -0,0 +1,19 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+FROM plone/frontend-builder-next:${VOLTO_VERSION} as builder
+
+# Build Volto Project and then remove directories not needed for production
+RUN <<EOT
+    set -e
+    pnpm build
+EOT
+
+FROM plone/frontend-prod-config-next:${VOLTO_VERSION} as base
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="plone-frontend" \
+      org.label-schema.description="Plone frontend image" \
+      org.label-schema.vendor="Plone Foundation"
+
+# Copy Volto project
+COPY --from=builder /app/ /app/
diff --git a/next/Dockerfile.builder b/next/Dockerfile.builder
new file mode 100644
index 0000000..7c92d81
--- /dev/null
+++ b/next/Dockerfile.builder
@@ -0,0 +1,39 @@
+# syntax=docker/dockerfile:1
+FROM node:20-slim
+ARG VOLTO_VERSION
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="frontend-base" \
+      org.label-schema.description="Plone frontend builder image" \
+      org.label-schema.vendor="Plone Foundation"
+
+RUN <<EOT
+    set -e
+    apt update
+    apt install -y --no-install-recommends python3 build-essential git ca-certificates
+    npm install --no-audit --no-fund -g mrs-developer
+    mkdir /app
+    chown -R node:node /app
+    rm -rf /var/lib/apt/lists/*
+EOT
+
+WORKDIR /app
+RUN corepack enable
+
+USER node
+COPY --chown=node:node next/mrs.developer.json /app/.
+COPY --chown=node:node next/pnpm-workspace.yaml /app/.
+COPY --chown=node:node next/package.json /app/.
+COPY --chown=node:node next/.npmrc /app/.
+COPY --chown=node:node next/volto.config.js /app/.
+
+RUN <<EOT
+    set -e
+    sed -i 's/${VOLTO_VERSION}/'"$VOLTO_VERSION"'/g' mrs.developer.json
+    missdev --no-config --fetch-https
+    mkdir packages
+EOT
+
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install
diff --git a/next/Dockerfile.prod b/next/Dockerfile.prod
new file mode 100644
index 0000000..6df812b
--- /dev/null
+++ b/next/Dockerfile.prod
@@ -0,0 +1,39 @@
+# syntax=docker/dockerfile:1
+FROM node:20-slim
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="frontend-prod-config" \
+      org.label-schema.description="Slim image for Plone frontend deployments" \
+      org.label-schema.vendor="Plone Foundation"
+
+
+# Install busybox and wget
+RUN <<EOT
+    set -e
+    apt update
+    apt install -y --no-install-recommends busybox wget git
+    busybox --install -s
+    rm -rf /var/lib/apt/lists/*
+    mkdir /app
+    chown -R node:node /app
+EOT
+
+RUN corepack enable
+
+# Run the image with user node
+USER node
+
+# Set working directory to /app
+WORKDIR /app
+
+# Expose default Express port
+EXPOSE 3000
+
+# Set healthcheck to port 3000
+HEALTHCHECK --interval=10s --timeout=5s --start-period=30s CMD [ -n "$LISTEN_PORT" ] || LISTEN_PORT=3000 ; wget -q http://127.0.0.1:"$LISTEN_PORT" -O - || exit 1
+
+# Entrypoint would be pnpm
+ENTRYPOINT [ "pnpm" ]
+
+# And the image will run in production mode
+CMD ["start:prod"]
diff --git a/next/mrs.developer.json b/next/mrs.developer.json
new file mode 100644
index 0000000..6521e38
--- /dev/null
+++ b/next/mrs.developer.json
@@ -0,0 +1,9 @@
+{
+  "core": {
+    "output": "./",
+    "package": "@plone/volto",
+    "url": "git@github.com:plone/volto.git",
+    "https": "https://github.com/plone/volto.git",
+    "tag": "${VOLTO_VERSION}"
+  }
+}
diff --git a/next/package.json b/next/package.json
new file mode 100644
index 0000000..b991f77
--- /dev/null
+++ b/next/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "builder-next",
+  "scripts": {
+    "start:prod": "pnpm --filter @plone/volto start:prod",
+    "build": "pnpm build:deps && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build",
+    "build:deps": "pnpm --filter @plone/registry --filter @plone/components build"
+  },
+  "dependencies": {
+    "@plone/volto": "workspace:*",
+    "@plone/registry": "workspace:*"
+  },
+  "packageManager": "pnpm@8.15.4"
+}
diff --git a/next/pnpm-workspace.yaml b/next/pnpm-workspace.yaml
new file mode 100644
index 0000000..c6c6219
--- /dev/null
+++ b/next/pnpm-workspace.yaml
@@ -0,0 +1,6 @@
+packages:
+  - 'core/packages/*'
+  - 'packages/volto-light-theme'
+  # This is for the packages in nested subdirs of packages/
+  # (already moved to the new project-less setup)
+  - 'packages/**/packages/*'
diff --git a/next/volto.config.js b/next/volto.config.js
new file mode 100644
index 0000000..91ad254
--- /dev/null
+++ b/next/volto.config.js
@@ -0,0 +1,7 @@
+const addons = [];
+const theme = "";
+
+module.exports = {
+  addons,
+  theme,
+};

From 6909077a5293483a15c835e125335dcfdfc4377c Mon Sep 17 00:00:00 2001
From: Victor Fernandez de Alba <sneridagh@gmail.com>
Date: Tue, 26 Mar 2024 09:12:17 +0100
Subject: [PATCH 2/2] Add dev image and fix Makefile

---
 .github/workflows/release-next.yml | 94 ++++++++++++++++++++++++++++++
 Makefile                           |  7 ++-
 next/Dockerfile.dev                | 19 ++++++
 3 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/release-next.yml
 create mode 100644 next/Dockerfile.dev

diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml
new file mode 100644
index 0000000..ad29e70
--- /dev/null
+++ b/.github/workflows/release-next.yml
@@ -0,0 +1,94 @@
+name: Release new Docker image
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+env:
+  BASE_IMAGE_NAME: plone/frontend
+  PLATFORMS: linux/amd64,linux/arm64
+  IS_LATEST: false
+
+jobs:
+
+  meta:
+    runs-on: ubuntu-latest
+    outputs:
+      BASE_IMAGE_NAME: ${{ steps.vars.outputs.BASE_IMAGE_NAME }}
+      IS_LATEST: ${{ steps.vars.outputs.IS_LATEST }}
+      PLATFORMS: ${{ steps.vars.outputs.PLATFORMS }}
+      VOLTO_VERSION: ${{ steps.vars.outputs.VOLTO_VERSION }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set BASE_IMAGE_NAME, IS_LATEST, PLATFORMS, VOLTO_VERSION
+        id: vars
+        run: |
+          echo "BASE_IMAGE_NAME=$BASE_IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "PLATFORMS=$PLATFORMS" >> $GITHUB_OUTPUT
+          echo "IS_LATEST=$IS_LATEST" >> $GITHUB_OUTPUT
+          echo "VOLTO_VERSION=$(cat version.txt)" >> $GITHUB_OUTPUT
+
+  builder-image:
+    needs:
+      - meta
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-builder-next
+      dockerfile: next/Dockerfile.builder
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  prod-conf-image:
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-prod-config-next
+      dockerfile: next/Dockerfile.prod
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
+
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+    needs:
+      - meta
+
+  dev-image:
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: ${{ needs.meta.outputs.BASE_IMAGE_NAME }}-dev-next
+      dockerfile: next/Dockerfile.dev
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+    needs:
+      - meta
+      - builder-image
+
+  plone-frontend:
+    uses: ./.github/workflows/image-release.yml
+    with:
+      volto-version: ${{ needs.meta.outputs.VOLTO_VERSION }}
+      image-name: plone/plone-frontend-next
+      dockerfile: next/Dockerfile
+      platforms: ${{ needs.meta.outputs.PLATFORMS  }}
+      is-latest: ${{ needs.meta.outputs.IS_LATEST == 'true'  }}
+    secrets:
+      registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
+    needs:
+      - meta
+      - builder-image
+      - prod-conf-image
diff --git a/Makefile b/Makefile
index 37b1bfe..4ebed4c 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,11 @@ image-dev:  ## Build Dev Image
 	@echo "Building $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)"
 	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG) -f Dockerfile.dev --load
 
+.PHONY: image-dev-next
+image-dev-next:  ## Build Dev Image
+	@echo "Building $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-dev-next:$(IMAGE_TAG) -f next/Dockerfile.dev --load
+
 .PHONY: image-prod-config
 image-prod-config:  ## Build Prod Image
 	@echo "Building $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)"
@@ -96,7 +101,7 @@ image-main:  ## Build main image
 .PHONY: image-main-next
 image-main-next:  ## Build main image
 	@echo "Building $(MAIN_IMAGE_NAME):$(IMAGE_TAG)"
-	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG) -f next/Dockerfile --load
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(MAIN_IMAGE_NAME)-next:$(IMAGE_TAG) -f next/Dockerfile --load
 
 .PHONY: image-nightly
 image-nightly:  ## Build Docker Image Nightly
diff --git a/next/Dockerfile.dev b/next/Dockerfile.dev
new file mode 100644
index 0000000..27fed55
--- /dev/null
+++ b/next/Dockerfile.dev
@@ -0,0 +1,19 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+FROM plone/frontend-builder-next:${VOLTO_VERSION}
+
+LABEL maintainer="Plone Community <dev@plone.org>" \
+      org.label-schema.name="frontend-dev" \
+      org.label-schema.description="Plone frontend image for development" \
+      org.label-schema.vendor="Plone Foundation"
+
+WORKDIR /app
+
+# Expose ports 3000 and 3001 (used by Express in development mode) and port 6006 (Storybook)
+EXPOSE 3000 3001 6006
+
+# Entrypoint would be yarn
+ENTRYPOINT [ "pnpm" ]
+
+# Run the project in development mode
+CMD ["start"]