Skip to content

Commit

Permalink
Update to plone-backend 6.0.5 (#4897) (#4909)
Browse files Browse the repository at this point in the history
Co-authored-by: David Glick <david@glicksoftware.com>
  • Loading branch information
sneridagh and davisagli authored Jun 23, 2023
1 parent 5580d42 commit 733d35e
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion api/buildout.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions news/4897.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update to version 6.0.5 of Plone backend. @davisagli
10 changes: 10 additions & 0 deletions packages/generator-volto/generators/addon/templates/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>"
Expand Down

0 comments on commit 733d35e

Please sign in to comment.