Update to plone-backend 6.0.5 (#4897) (#4909)

Co-authored-by: David Glick <david@glicksoftware.com>
plone · Jun 23, 2023 · 733d35e · 733d35e
1 parent 5580d42
commit 733d35e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -13,8 +13,8 @@ MAKEFLAGS+=--no-builtin-rules
 # Project settings
 
 INSTANCE_PORT=8080
-DOCKER_IMAGE=plone/server-dev:6.0.4
-DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.4
+DOCKER_IMAGE=plone/server-dev:6.0.5
+DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.5
 KGS=
 NODEBIN = ./node_modules/.bin
 SCRIPTSPACKAGE = ./packages/scripts

diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ cd myvoltoproject
 You can bootstrap a ready Docker Plone container with all the dependencies and ready for Volto use. We recommend to use the Plone docker builds based in `pip` [plone/plone-backend](https://github.com/plone/plone-backend) image:
 
 ```shell
-docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e PROFILES="plone.volto:default-homepage" plone/plone-backend:6.0.0b3
+docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e PROFILES="plone.volto:default-homepage" plone/plone-backend:6.0.5
 ```
 
 or as an alternative if you have experience with Plone and you have all the
@@ -267,7 +267,7 @@ yarn
 Either using a Docker command:
 
 ```shell
-docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e PROFILES="plone.volto:default-homepage" plone/plone-backend:6.0.0b3
+docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e PROFILES="plone.volto:default-homepage" plone/plone-backend:6.0.5
 ```
 
 or using the convenience makefile command:

diff --git a/api/buildout.cfg b/api/buildout.cfg
@@ -1,7 +1,7 @@
 [buildout]
 index = https://pypi.org/simple/
 extends =
-    http://dist.plone.org/release/6.0.4/versions.cfg
+    http://dist.plone.org/release/6.0.5/versions.cfg
     version-constraints.cfg
     versions.cfg
 parts = instance plonesite site-packages test robot-server

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 services:
 
   backend:
-    image: plone/plone-backend:6.0.0b2
+    image: plone/plone-backend:6.0.5
     # Plone 5.2 series can be used too
     # image: plone/plone-backend:5.2.9
     ports:

diff --git a/news/4897.bugfix b/news/4897.bugfix
@@ -0,0 +1 @@
+Update to version 6.0.5 of Plone backend. @davisagli
diff --git a/packages/generator-volto/generators/addon/templates/Makefile b/packages/generator-volto/generators/addon/templates/Makefile
@@ -11,6 +11,16 @@ MAKEFLAGS+=--warn-undefined-variables
 MAKEFLAGS+=--no-builtin-rules
 
 # Project settings
+# Update the versions depending on your project requirements | Last Updated 2023-06-17
+DOCKER_IMAGE=plone/server-dev:6.0.5
+DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.5
+KGS=
+NODEBIN = ./node_modules/.bin
+
+# Plone 5 legacy
+DOCKER_IMAGE5=plone/plone-backend:5.2.10
+KGS5=plone.restapi==8.37.0 plone.volto==4.0.8 plone.rest==3.0.0
+TESTING_ADDONS=plone.app.robotframework==2.0.0 plone.app.testing==7.0.0
 
 DIR=$(shell basename $$(pwd))
 ADDON ?= "<%= addonName %>"