Prepare release 18.0.0 (#52)

* Prepare release 18.0.0

* Fix typo in Dockerfile

.github/workflows/description.yml

@@ -3,7 +3,7 @@ name: Update Docker Hub Description
 on:
   push:
     branches:
-      - '17.x'
+      - '18.x'
     paths:
       - "README.md"
       - .github/workflows/description.yml
@@ -16,9 +16,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Update repo description
         uses: peter-evans/dockerhub-description@v4
         with:

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
 env:
   BASE_IMAGE_NAME: plone/frontend
   PLATFORMS: linux/amd64,linux/arm64
-  IS_LATEST: false
+  IS_LATEST: true
 
 jobs:
   meta:

Makefile

@@ -61,23 +61,23 @@ show-image: ## Print Version
 
 .PHONY: image-builder
 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
+	$(MAKE) -C "./pnpm/" image-builder
+	$(MAKE) -C "./yarn/" image-builder
 
 .PHONY: image-dev
 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
+	$(MAKE) -C "./pnpm/" image-dev
+	$(MAKE) -C "./yarn/" image-dev
 
 .PHONY: image-prod-config
 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
+	$(MAKE) -C "./pnpm/" image-prod-config
+	$(MAKE) -C "./yarn/" image-prod-config
 
 .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
+	$(MAKE) -C "./pnpm/" image-main
+	$(MAKE) -C "./yarn/" image-main
 
 .PHONY: build-images
 build-images:  ## Build Images

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <img alt="Plone Logo" width="200px" src="https://raw.githubusercontent.com/plone/plone-frontend/15.x/docs/logo.png">
+    <img alt="Plone Logo" width="200px" src="https://raw.githubusercontent.com/plone/plone-frontend/18.x/docs/logo.png">
 </p>
 
 <h1 align="center">
@@ -22,16 +22,12 @@ To check and report issues and contribute to Volto, See [plone/volto](https://gi
 
 ## Supported tags and respective Dockerfile links
 
-- `17`, `17.7`, `17.7.0`, `latest` [(17.x/Dockerfile)](https://github.com/plone/plone-frontend/blob/17.x/Dockerfile)
-
-- `16`, `16.30`, `16.30.0` [(16.x/Dockerfile)](https://github.com/plone/plone-frontend/blob/16.x/Dockerfile)
-
-### Next major version
-
-- `18`, `18-yarn` [(18.x/Dockerfile)](https://github.com/plone/plone-frontend/blob/18.x/Dockerfile)
+- `18`, `18.0`, `18.0`, `latest` [(18.x/Dockerfile)](https://github.com/plone/plone-frontend/blob/18.x/Dockerfile)
+- `17`, `17.7`, `17.7.0` [(17.x/Dockerfile)](https://github.com/plone/plone-frontend/blob/17.x/Dockerfile)
 
 ### Older tags
 
+- `16`, `16.30`, `16.30.0` [(16.x/Dockerfile)](https://github.com/plone/plone-frontend/blob/16.x/Dockerfile)
 - `15, 15.16, 15.16.0` [(15.16.0/Dockerfile)](https://github.com/plone/plone-frontend/blob/v15.16.0/Dockerfile)
 - `14, 14.10, 14.10.0, 14.10.0-node16` [(/14/14.10/14.10.0/Dockerfile.node16)](https://github.com/plone/plone-frontend/blob/5419f28e2d00788ca042c49cc44df83b6785ee3a/14/14.10/14.10.0/Dockerfile.node16)
 - `13, 13.15, 13.15.1-node14` [(13/13.15/13.15.1/Dockerfile.node14)](https://github.com/plone/plone-frontend/blob/5419f28e2d00788ca042c49cc44df83b6785ee3a/13/13.15/13.15.1/Dockerfile.node14)

pnpm/.dockerignore

@@ -0,0 +1 @@
+Makefile

pnpm/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION} as builder
+FROM plone/frontend-builder:${VOLTO_VERSION} AS builder
 
 # Build Volto Project and then remove directories not needed for production
 COPY pnpm-workspace.yaml /app/
@@ -11,7 +11,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 plone/frontend-prod-config:${VOLTO_VERSION} AS base
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-frontend" \

pnpm/Makefile

@@ -0,0 +1,58 @@
+## Defensive settings for make:
+#     https://tech.davis-hansson.com/p/make/
+SHELL:=bash
+.ONESHELL:
+.SHELLFLAGS:=-xeu -o pipefail -O inherit_errexit -c
+.SILENT:
+.DELETE_ON_ERROR:
+MAKEFLAGS+=--warn-undefined-variables
+MAKEFLAGS+=--no-builtin-rules
+
+# We like colors
+# From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
+RED=`tput setaf 1`
+GREEN=`tput setaf 2`
+RESET=`tput sgr0`
+YELLOW=`tput setaf 3`
+
+# Current version
+MAIN_IMAGE_NAME=plone/plone-frontend
+BASE_IMAGE_NAME=plone/frontend
+VOLTO_VERSION=$$(cat ../version.txt)
+IMAGE_TAG=${VOLTO_VERSION}
+IMAGE_SUFFIX=
+
+.PHONY: all
+all: help
+
+# Add the following 'help' target to your Makefile
+# And add help text after each target name starting with '\#\#'
+.PHONY: help
+help: # This help message
+	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+# Build image
+.PHONY: show-image
+show-image: ## Print Version
+	@echo "$(MAIN_IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@echo "$(BASE_IMAGE_NAME)-(builder|dev|prod-config):$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+
+.PHONY: image-builder
+image-builder:  ## Build Base Image
+	@echo "Building $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG)$(IMAGE_SUFFIX) (PNPM)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile.builder --load
+
+.PHONY: image-dev
+image-dev:  ## Build Dev Image
+	@echo "Building $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile.dev --load
+
+.PHONY: image-prod-config
+image-prod-config:  ## Build Prod Image
+	@echo "Building $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile.prod --load
+
+.PHONY: image-main
+image-main:  ## Build main image
+	@echo "Building $(MAIN_IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile --load

version.txt

@@ -1 +1 @@
-18.0.0-alpha.49
+18.0.0

yarn/.dockerignore

@@ -0,0 +1 @@
+Makefile

yarn/Dockerfile

@@ -1,15 +1,15 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION}-yarn as builder
+FROM plone/frontend-builder:${VOLTO_VERSION}-yarn AS builder
 
 # Build Volto Project and then remove directories not needed for production
 RUN <<EOT
-    set -e 
+    set -e
     yarn build
     rm -rf cache omelette .yarn/cache
 EOT
 
-FROM plone/frontend-prod-config:${VOLTO_VERSION}-yarn as base
+FROM plone/frontend-prod-config:${VOLTO_VERSION}-yarn AS base
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-frontend" \

yarn/Makefile

@@ -0,0 +1,58 @@
+## Defensive settings for make:
+#     https://tech.davis-hansson.com/p/make/
+SHELL:=bash
+.ONESHELL:
+.SHELLFLAGS:=-xeu -o pipefail -O inherit_errexit -c
+.SILENT:
+.DELETE_ON_ERROR:
+MAKEFLAGS+=--warn-undefined-variables
+MAKEFLAGS+=--no-builtin-rules
+
+# We like colors
+# From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
+RED=`tput setaf 1`
+GREEN=`tput setaf 2`
+RESET=`tput sgr0`
+YELLOW=`tput setaf 3`
+
+# Current version
+MAIN_IMAGE_NAME=plone/plone-frontend
+BASE_IMAGE_NAME=plone/frontend
+VOLTO_VERSION=$$(cat ../version.txt)
+IMAGE_TAG=${VOLTO_VERSION}
+IMAGE_SUFFIX=-yarn
+
+.PHONY: all
+all: help
+
+# Add the following 'help' target to your Makefile
+# And add help text after each target name starting with '\#\#'
+.PHONY: help
+help: # This help message
+	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+# Build image
+.PHONY: show-image
+show-image: ## Print Version
+	@echo "$(MAIN_IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@echo "$(BASE_IMAGE_NAME)-(builder|dev|prod-config):$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+
+.PHONY: image-builder
+image-builder:  ## Build Base Image
+	@echo "Building $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG)$(IMAGE_SUFFIX) (PNPM)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile.builder --load
+
+.PHONY: image-dev
+image-dev:  ## Build Dev Image
+	@echo "Building $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile.dev --load
+
+.PHONY: image-prod-config
+image-prod-config:  ## Build Prod Image
+	@echo "Building $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile.prod --load
+
+.PHONY: image-main
+image-main:  ## Build main image
+	@echo "Building $(MAIN_IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_SUFFIX)"
+	@docker buildx build . --build-arg VOLTO_VERSION=${VOLTO_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_SUFFIX) -f Dockerfile --load