Plone: Release 5.2.2 #8746
Merged
Plone: Release 5.2.2 #8746
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 69aa8c7:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b9a0ad8..9023697 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,22 @@
Maintainers: Alin Voinea <alin.voinea@gmail.com> (@avoinea), Sven Strack <sven@so36.net> (@svx), Antonio De Marinis <Antonio.DeMarinis@eea.europa.eu> (@demarant)
GitRepo: https://github.com/plone/plone.docker.git
-Tags: 5.2.1, 5.2, 5, latest
+Tags: 5.2.2-alpine, 5.2-alpine, 5-alpine, alpine
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: f66610b264ad294acc2bb85676e53e803994a5e7
+Directory: 5.2/5.2.2/alpine
+
+Tags: 5.2.2-python36, 5.2-python36, 5-python36, python36
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e430c572526898d695431896827904def2493fed
-Directory: 5.2/5.2.1/debian
+GitCommit: f66610b264ad294acc2bb85676e53e803994a5e7
+Directory: 5.2/5.2.2/python36
-Tags: 5.2.1-alpine, 5.2-alpine, 5-alpine, alpine
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: e430c572526898d695431896827904def2493fed
-Directory: 5.2/5.2.1/alpine
+Tags: 5.2.2-python37, 5.2-python37, 5-python37, python37
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: f66610b264ad294acc2bb85676e53e803994a5e7
+Directory: 5.2/5.2.2/python37
+
+Tags: 5.2.2-python38, 5.2-python38, 5-python38, python38, 5.2.2, 5.2, 5, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: f66610b264ad294acc2bb85676e53e803994a5e7
+Directory: 5.2/5.2.2/debian
diff --git a/_bashbrew-list b/_bashbrew-list
index 282f3c9..9f8b271 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,8 +1,20 @@
plone:5
plone:5-alpine
+plone:5-python36
+plone:5-python37
+plone:5-python38
plone:5.2
plone:5.2-alpine
-plone:5.2.1
-plone:5.2.1-alpine
+plone:5.2-python36
+plone:5.2-python37
+plone:5.2-python38
+plone:5.2.2
+plone:5.2.2-alpine
+plone:5.2.2-python36
+plone:5.2.2-python37
+plone:5.2.2-python38
plone:alpine
plone:latest
+plone:python36
+plone:python37
+plone:python38
diff --git a/plone_alpine/Dockerfile b/plone_alpine/Dockerfile
index e7e3383..8a2a52f 100644
--- a/plone_alpine/Dockerfile
+++ b/plone_alpine/Dockerfile
@@ -1,17 +1,17 @@
-FROM python:3.7-alpine
+FROM python:3.8-alpine
-ENV PIP=19.3.1 \
- ZC_BUILDOUT=2.13.2 \
- SETUPTOOLS=45.0.0 \
- WHEEL=0.33.6 \
+ENV PIP=20.2.3 \
+ ZC_BUILDOUT=2.13.3 \
+ SETUPTOOLS=50.3.0 \
+ WHEEL=0.35.1 \
PLONE_MAJOR=5.2 \
- PLONE_VERSION=5.2.1 \
- PLONE_VERSION_RELEASE=Plone-5.2.1-UnifiedInstaller-r2 \
- PLONE_MD5=42407c0313791d3626dc86e674684efe
+ PLONE_VERSION=5.2.2 \
+ PLONE_VERSION_RELEASE=Plone-5.2.2-UnifiedInstaller \
+ PLONE_MD5=a603eddfd3abb0528f0861472ebac934
LABEL plone=$PLONE_VERSION \
os="alpine" \
- os.version="3.11" \
+ os.version="3.12" \
name="Plone 5.2" \
description="Plone image, based on Unified Installer" \
maintainer="Plone Community"
diff --git a/plone_alpine/buildout.cfg b/plone_alpine/buildout.cfg
index 27bf021..d66bec0 100644
--- a/plone_alpine/buildout.cfg
+++ b/plone_alpine/buildout.cfg
@@ -62,27 +62,25 @@ setuptools =
zc.buildout =
# The following part definition lists the versions picked:
-Pillow = 6.2.2
-bobtemplates.plone = 5.0.4
-mr.bob = 0.1.2
-regex = 2019.6.8
+plone.restapi = 6.14.0
-# Required by:
-# plone.recipe.zeoserver==2.0.1
-ZopeUndo = 4.3
+# buildout.cfg
+bobtemplates.plone = 5.1.1
+collective.recipe.plonesite = 1.11.0
+mr.bob = 0.1.2
+regex = 2020.7.14
# Required by:
-# bobtemplates.plone==4.0.4
+# bobtemplates.plone==5.1.1
case-conversion = 2.1.0
-# plonesite
-collective.recipe.plonesite = 1.11.0
-
-# Required by: plone.restapi
-plone.rest = 1.6.0
-plone.restapi = 6.2.0
-PyJWT = 1.7.1
-
# develop.cfg
+SecretStorage = 3.1.2
collective.checkdocs = 0.2
-zest.pocompile = 1.4
+jeepney = 0.4.3
+keyring = 21.4.0
+zest.pocompile = 1.5.0
+
+# Required by:
+# SecretStorage==3.1.2
+cryptography = 3.1
diff --git a/plone_latest/Dockerfile b/plone_latest/Dockerfile
index 47d326d..5fb20dc 100644
--- a/plone_latest/Dockerfile
+++ b/plone_latest/Dockerfile
@@ -1,17 +1,17 @@
-FROM python:3.7-slim-stretch
+FROM python:3.8-slim-buster
-ENV PIP=19.3.1 \
- ZC_BUILDOUT=2.13.2 \
- SETUPTOOLS=45.0.0 \
- WHEEL=0.33.6 \
+ENV PIP=20.2.3 \
+ ZC_BUILDOUT=2.13.3 \
+ SETUPTOOLS=50.3.0 \
+ WHEEL=0.35.1 \
PLONE_MAJOR=5.2 \
- PLONE_VERSION=5.2.1 \
- PLONE_VERSION_RELEASE=Plone-5.2.1-UnifiedInstaller-r2 \
- PLONE_MD5=42407c0313791d3626dc86e674684efe
+ PLONE_VERSION=5.2.2 \
+ PLONE_VERSION_RELEASE=Plone-5.2.2-UnifiedInstaller \
+ PLONE_MD5=a603eddfd3abb0528f0861472ebac934
LABEL plone=$PLONE_VERSION \
os="debian" \
- os.version="9" \
+ os.version="10" \
name="Plone 5.2" \
description="Plone image, based on Unified Installer" \
maintainer="Plone Community"
diff --git a/plone_latest/buildout.cfg b/plone_latest/buildout.cfg
index 27bf021..d66bec0 100644
--- a/plone_latest/buildout.cfg
+++ b/plone_latest/buildout.cfg
@@ -62,27 +62,25 @@ setuptools =
zc.buildout =
# The following part definition lists the versions picked:
-Pillow = 6.2.2
-bobtemplates.plone = 5.0.4
-mr.bob = 0.1.2
-regex = 2019.6.8
+plone.restapi = 6.14.0
-# Required by:
-# plone.recipe.zeoserver==2.0.1
-ZopeUndo = 4.3
+# buildout.cfg
+bobtemplates.plone = 5.1.1
+collective.recipe.plonesite = 1.11.0
+mr.bob = 0.1.2
+regex = 2020.7.14
# Required by:
-# bobtemplates.plone==4.0.4
+# bobtemplates.plone==5.1.1
case-conversion = 2.1.0
-# plonesite
-collective.recipe.plonesite = 1.11.0
-
-# Required by: plone.restapi
-plone.rest = 1.6.0
-plone.restapi = 6.2.0
-PyJWT = 1.7.1
-
# develop.cfg
+SecretStorage = 3.1.2
collective.checkdocs = 0.2
-zest.pocompile = 1.4
+jeepney = 0.4.3
+keyring = 21.4.0
+zest.pocompile = 1.5.0
+
+# Required by:
+# SecretStorage==3.1.2
+cryptography = 3.1
diff --git a/plone_latest/Dockerfile b/plone_python36/Dockerfile
similarity index 87%
copy from plone_latest/Dockerfile
copy to plone_python36/Dockerfile
index 47d326d..6bc6e07 100644
--- a/plone_latest/Dockerfile
+++ b/plone_python36/Dockerfile
@@ -1,17 +1,17 @@
-FROM python:3.7-slim-stretch
+FROM python:3.6-slim-buster
-ENV PIP=19.3.1 \
- ZC_BUILDOUT=2.13.2 \
- SETUPTOOLS=45.0.0 \
- WHEEL=0.33.6 \
+ENV PIP=20.2.3 \
+ ZC_BUILDOUT=2.13.3 \
+ SETUPTOOLS=50.3.0 \
+ WHEEL=0.35.1 \
PLONE_MAJOR=5.2 \
- PLONE_VERSION=5.2.1 \
- PLONE_VERSION_RELEASE=Plone-5.2.1-UnifiedInstaller-r2 \
- PLONE_MD5=42407c0313791d3626dc86e674684efe
+ PLONE_VERSION=5.2.2 \
+ PLONE_VERSION_RELEASE=Plone-5.2.2-UnifiedInstaller \
+ PLONE_MD5=a603eddfd3abb0528f0861472ebac934
LABEL plone=$PLONE_VERSION \
os="debian" \
- os.version="9" \
+ os.version="10" \
name="Plone 5.2" \
description="Plone image, based on Unified Installer" \
maintainer="Plone Community"
diff --git a/plone_alpine/buildout.cfg b/plone_python36/buildout.cfg
similarity index 85%
copy from plone_alpine/buildout.cfg
copy to plone_python36/buildout.cfg
index 27bf021..d66bec0 100644
--- a/plone_alpine/buildout.cfg
+++ b/plone_python36/buildout.cfg
@@ -62,27 +62,25 @@ setuptools =
zc.buildout =
# The following part definition lists the versions picked:
-Pillow = 6.2.2
-bobtemplates.plone = 5.0.4
-mr.bob = 0.1.2
-regex = 2019.6.8
+plone.restapi = 6.14.0
-# Required by:
-# plone.recipe.zeoserver==2.0.1
-ZopeUndo = 4.3
+# buildout.cfg
+bobtemplates.plone = 5.1.1
+collective.recipe.plonesite = 1.11.0
+mr.bob = 0.1.2
+regex = 2020.7.14
# Required by:
-# bobtemplates.plone==4.0.4
+# bobtemplates.plone==5.1.1
case-conversion = 2.1.0
-# plonesite
-collective.recipe.plonesite = 1.11.0
-
-# Required by: plone.restapi
-plone.rest = 1.6.0
-plone.restapi = 6.2.0
-PyJWT = 1.7.1
-
# develop.cfg
+SecretStorage = 3.1.2
collective.checkdocs = 0.2
-zest.pocompile = 1.4
+jeepney = 0.4.3
+keyring = 21.4.0
+zest.pocompile = 1.5.0
+
+# Required by:
+# SecretStorage==3.1.2
+cryptography = 3.1
diff --git a/plone_latest/docker-entrypoint.sh b/plone_python36/docker-entrypoint.sh
similarity index 100%
copy from plone_latest/docker-entrypoint.sh
copy to plone_python36/docker-entrypoint.sh
diff --git a/plone_alpine/docker-initialize.py b/plone_python36/docker-initialize.py
similarity index 100%
copy from plone_alpine/docker-initialize.py
copy to plone_python36/docker-initialize.py
diff --git a/plone_latest/Dockerfile b/plone_python37/Dockerfile
similarity index 87%
copy from plone_latest/Dockerfile
copy to plone_python37/Dockerfile
index 47d326d..f22d333 100644
--- a/plone_latest/Dockerfile
+++ b/plone_python37/Dockerfile
@@ -1,17 +1,17 @@
-FROM python:3.7-slim-stretch
+FROM python:3.7-slim-buster
-ENV PIP=19.3.1 \
- ZC_BUILDOUT=2.13.2 \
- SETUPTOOLS=45.0.0 \
- WHEEL=0.33.6 \
+ENV PIP=20.2.3 \
+ ZC_BUILDOUT=2.13.3 \
+ SETUPTOOLS=50.3.0 \
+ WHEEL=0.35.1 \
PLONE_MAJOR=5.2 \
- PLONE_VERSION=5.2.1 \
- PLONE_VERSION_RELEASE=Plone-5.2.1-UnifiedInstaller-r2 \
- PLONE_MD5=42407c0313791d3626dc86e674684efe
+ PLONE_VERSION=5.2.2 \
+ PLONE_VERSION_RELEASE=Plone-5.2.2-UnifiedInstaller \
+ PLONE_MD5=a603eddfd3abb0528f0861472ebac934
LABEL plone=$PLONE_VERSION \
os="debian" \
- os.version="9" \
+ os.version="10" \
name="Plone 5.2" \
description="Plone image, based on Unified Installer" \
maintainer="Plone Community"
diff --git a/plone_alpine/buildout.cfg b/plone_python37/buildout.cfg
similarity index 85%
copy from plone_alpine/buildout.cfg
copy to plone_python37/buildout.cfg
index 27bf021..d66bec0 100644
--- a/plone_alpine/buildout.cfg
+++ b/plone_python37/buildout.cfg
@@ -62,27 +62,25 @@ setuptools =
zc.buildout =
# The following part definition lists the versions picked:
-Pillow = 6.2.2
-bobtemplates.plone = 5.0.4
-mr.bob = 0.1.2
-regex = 2019.6.8
+plone.restapi = 6.14.0
-# Required by:
-# plone.recipe.zeoserver==2.0.1
-ZopeUndo = 4.3
+# buildout.cfg
+bobtemplates.plone = 5.1.1
+collective.recipe.plonesite = 1.11.0
+mr.bob = 0.1.2
+regex = 2020.7.14
# Required by:
-# bobtemplates.plone==4.0.4
+# bobtemplates.plone==5.1.1
case-conversion = 2.1.0
-# plonesite
-collective.recipe.plonesite = 1.11.0
-
-# Required by: plone.restapi
-plone.rest = 1.6.0
-plone.restapi = 6.2.0
-PyJWT = 1.7.1
-
# develop.cfg
+SecretStorage = 3.1.2
collective.checkdocs = 0.2
-zest.pocompile = 1.4
+jeepney = 0.4.3
+keyring = 21.4.0
+zest.pocompile = 1.5.0
+
+# Required by:
+# SecretStorage==3.1.2
+cryptography = 3.1
diff --git a/plone_latest/docker-entrypoint.sh b/plone_python37/docker-entrypoint.sh
similarity index 100%
copy from plone_latest/docker-entrypoint.sh
copy to plone_python37/docker-entrypoint.sh
diff --git a/plone_alpine/docker-initialize.py b/plone_python37/docker-initialize.py
similarity index 100%
copy from plone_alpine/docker-initialize.py
copy to plone_python37/docker-initialize.py |
This comment was marked as spam.
This comment was marked as spam.
|
While we don't actively recommend using labels, we do recommend that Image label names should adhere to the image spec: https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md. This can definitely be addressed later so that this update doesn't get delayed through a weekend. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs plone/plone.docker#138