Plone 5.1.4 and 4.3.18 released #5014
Merged
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:diff --git a/_bashbrew-list b/_bashbrew-list
index 605fbe3..9ae0a73 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,13 +2,13 @@ plone:4
plone:4-alpine
plone:4.3
plone:4.3-alpine
-plone:4.3.17
-plone:4.3.17-alpine
+plone:4.3.18
+plone:4.3.18-alpine
plone:5
plone:5-alpine
plone:5.1
plone:5.1-alpine
-plone:5.1.2
-plone:5.1.2-alpine
+plone:5.1.4
+plone:5.1.4-alpine
plone:alpine
plone:latest
diff --git a/plone_4-alpine/Dockerfile b/plone_4-alpine/Dockerfile
index b73d550..e82f2a7 100644
--- a/plone_4-alpine/Dockerfile
+++ b/plone_4-alpine/Dockerfile
@@ -1,11 +1,12 @@
FROM python:2.7-alpine3.7
ENV PIP=9.0.3 \
- ZC_BUILDOUT=2.11.2 \
- SETUPTOOLS=38.7.0 \
+ ZC_BUILDOUT=2.11.4 \
+ SETUPTOOLS=39.1.0 \
+ WHEEL=0.31.1 \
PLONE_MAJOR=4.3 \
- PLONE_VERSION=4.3.17 \
- PLONE_MD5=4d9f175803c63301758f42dbf68f015a
+ PLONE_VERSION=4.3.18 \
+ PLONE_MD5=c9932e919254a2799b0e340b2ecbda9b
LABEL plone=$PLONE_VERSION \
os="alpine" \
@@ -34,13 +35,10 @@ RUN apk add --no-cache --virtual .build-deps \
&& tar -zxvf Plone.tgz \
&& cp -rv ./Plone-$PLONE_VERSION-UnifiedInstaller/base_skeleton/* /plone/instance/ \
&& cp -v ./Plone-$PLONE_VERSION-UnifiedInstaller/buildout_templates/buildout.cfg /plone/instance/buildout-base.cfg \
- && pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT \
+ && pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT wheel==$WHEEL \
&& cd /plone/instance \
&& buildout \
&& rm -rf bin/buildout \
- && ln -s /usr/local/bin/buildout /plone/instance/bin/buildout \
- && ln -s /usr/local/bin/pip /plone/instance/bin/pip \
- && ln -s /usr/local/bin/python /plone/instance/bin/python \
&& ln -s /data/filestorage/ /plone/instance/var/filestorage \
&& ln -s /data/blobstorage /plone/instance//var/blobstorage \
&& chown -R plone:plone /plone /data \
diff --git a/plone_4-alpine/buildout.cfg b/plone_4-alpine/buildout.cfg
index 43c59c7..848b40a 100644
--- a/plone_4-alpine/buildout.cfg
+++ b/plone_4-alpine/buildout.cfg
@@ -11,6 +11,7 @@ var-dir=/data
user=admin:admin
parts +=
zeo
+ mrbob
[client1]
recipe =
@@ -20,12 +21,43 @@ recipe =
recipe = plone.recipe.zeoserver
zeo-address = 8080
+# Requires gcc, thus install it on image build
+[mrbob]
+recipe = zc.recipe.egg
+eggs =
+ mr.bob
+ bobtemplates.plone
+
[versions]
setuptools =
zc.buildout =
-Pillow = 4.3.0
+# The following part definition lists the versions picked:
+Pillow = 5.3.0
buildout.wheel = 0.2.0
plone.recipe.command = 1.1
plone.recipe.precompiler = 0.6
collective.recipe.backup = 4.0.1
+Unidecode = 0.04.16
+
+MarkupSafe = 1.0
+bobtemplates.plone = 3.5.1
+mr.bob = 0.1.2
+regex = 2018.8.29
+
+# Required by:
+# bobtemplates.plone==3.5.1
+case-conversion = 2.1.0
+
+# Required by:
+# bobtemplates.plone==3.5.1
+python-slugify = 1.2.6
+
+Products.DocFinderTab = 1.0.5
+collective.checkdocs = 0.2
+zest.pocompile = 1.4
+
+# Required by:
+# bobtemplates.plone==3.5.1
+# zest.releaser==6.15.0
+colorama = 0.4.0
diff --git a/plone_4/Dockerfile b/plone_4/Dockerfile
index eea222e..6e84162 100644
--- a/plone_4/Dockerfile
+++ b/plone_4/Dockerfile
@@ -1,11 +1,12 @@
FROM python:2.7-slim-stretch
ENV PIP=9.0.3 \
- ZC_BUILDOUT=2.11.2 \
- SETUPTOOLS=38.7.0 \
+ ZC_BUILDOUT=2.11.4 \
+ SETUPTOOLS=39.1.0 \
+ WHEEL=0.31.1 \
PLONE_MAJOR=4.3 \
- PLONE_VERSION=4.3.17 \
- PLONE_MD5=4d9f175803c63301758f42dbf68f015a
+ PLONE_VERSION=4.3.18 \
+ PLONE_MD5=c9932e919254a2799b0e340b2ecbda9b
LABEL plone=$PLONE_VERSION \
os="debian" \
@@ -28,13 +29,10 @@ RUN buildDeps="dpkg-dev gcc libbz2-dev libc6-dev libjpeg62-turbo-dev libopenjp2-
&& tar -xzf Plone.tgz \
&& cp -rv ./Plone-$PLONE_VERSION-UnifiedInstaller/base_skeleton/* /plone/instance/ \
&& cp -v ./Plone-$PLONE_VERSION-UnifiedInstaller/buildout_templates/buildout.cfg /plone/instance/buildout-base.cfg \
- && pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT \
+ && pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT wheel==$WHEEL \
&& cd /plone/instance \
&& buildout \
&& rm -rf bin/buildout \
- && ln -s /usr/local/bin/buildout /plone/instance/bin/buildout \
- && ln -s /usr/local/bin/pip /plone/instance/bin/pip \
- && ln -s /usr/local/bin/python /plone/instance/bin/python \
&& ln -s /data/filestorage/ /plone/instance/var/filestorage \
&& ln -s /data/blobstorage /plone/instance/var/blobstorage \
&& chown -R plone:plone /plone /data \
diff --git a/plone_4/buildout.cfg b/plone_4/buildout.cfg
index 43c59c7..848b40a 100644
--- a/plone_4/buildout.cfg
+++ b/plone_4/buildout.cfg
@@ -11,6 +11,7 @@ var-dir=/data
user=admin:admin
parts +=
zeo
+ mrbob
[client1]
recipe =
@@ -20,12 +21,43 @@ recipe =
recipe = plone.recipe.zeoserver
zeo-address = 8080
+# Requires gcc, thus install it on image build
+[mrbob]
+recipe = zc.recipe.egg
+eggs =
+ mr.bob
+ bobtemplates.plone
+
[versions]
setuptools =
zc.buildout =
-Pillow = 4.3.0
+# The following part definition lists the versions picked:
+Pillow = 5.3.0
buildout.wheel = 0.2.0
plone.recipe.command = 1.1
plone.recipe.precompiler = 0.6
collective.recipe.backup = 4.0.1
+Unidecode = 0.04.16
+
+MarkupSafe = 1.0
+bobtemplates.plone = 3.5.1
+mr.bob = 0.1.2
+regex = 2018.8.29
+
+# Required by:
+# bobtemplates.plone==3.5.1
+case-conversion = 2.1.0
+
+# Required by:
+# bobtemplates.plone==3.5.1
+python-slugify = 1.2.6
+
+Products.DocFinderTab = 1.0.5
+collective.checkdocs = 0.2
+zest.pocompile = 1.4
+
+# Required by:
+# bobtemplates.plone==3.5.1
+# zest.releaser==6.15.0
+colorama = 0.4.0
diff --git a/plone_alpine/Dockerfile b/plone_alpine/Dockerfile
index 2317f8d..6f3c398 100644
--- a/plone_alpine/Dockerfile
+++ b/plone_alpine/Dockerfile
@@ -1,11 +1,12 @@
FROM python:2.7-alpine3.7
ENV PIP=9.0.3 \
- ZC_BUILDOUT=2.11.2 \
- SETUPTOOLS=38.7.0 \
+ ZC_BUILDOUT=2.11.4 \
+ SETUPTOOLS=39.1.0 \
+ WHEEL=0.31.1 \
PLONE_MAJOR=5.1 \
- PLONE_VERSION=5.1.2 \
- PLONE_MD5=e34790cea362b8db6a8ffe30854c6fc3
+ PLONE_VERSION=5.1.4 \
+ PLONE_MD5=ce3b87b1cb8ee30e577ae347d9bdd647
LABEL plone=$PLONE_VERSION \
os="alpine" \
@@ -34,12 +35,9 @@ RUN apk add --no-cache --virtual .build-deps \
&& tar -zxvf Plone.tgz \
&& cp -rv ./Plone-$PLONE_VERSION-UnifiedInstaller/base_skeleton/* /plone/instance/ \
&& cp -v ./Plone-$PLONE_VERSION-UnifiedInstaller/buildout_templates/buildout.cfg /plone/instance/buildout-base.cfg \
-&& pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT \
+&& pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT wheel==$WHEEL \
&& cd /plone/instance \
&& buildout \
-&& ln -s /usr/local/bin/pip /plone/instance/bin/pip \
-&& ln -s /usr/local/bin/python /plone/instance/bin/python \
-&& ln -s /usr/local/bin/buildout /plone/instance/bin/buildout \
&& ln -s /data/filestorage/ /plone/instance/var/filestorage \
&& ln -s /data/blobstorage /plone/instance//var/blobstorage \
&& chown -R plone:plone /plone /data \
diff --git a/plone_alpine/buildout.cfg b/plone_alpine/buildout.cfg
index 43c59c7..848b40a 100644
--- a/plone_alpine/buildout.cfg
+++ b/plone_alpine/buildout.cfg
@@ -11,6 +11,7 @@ var-dir=/data
user=admin:admin
parts +=
zeo
+ mrbob
[client1]
recipe =
@@ -20,12 +21,43 @@ recipe =
recipe = plone.recipe.zeoserver
zeo-address = 8080
+# Requires gcc, thus install it on image build
+[mrbob]
+recipe = zc.recipe.egg
+eggs =
+ mr.bob
+ bobtemplates.plone
+
[versions]
setuptools =
zc.buildout =
-Pillow = 4.3.0
+# The following part definition lists the versions picked:
+Pillow = 5.3.0
buildout.wheel = 0.2.0
plone.recipe.command = 1.1
plone.recipe.precompiler = 0.6
collective.recipe.backup = 4.0.1
+Unidecode = 0.04.16
+
+MarkupSafe = 1.0
+bobtemplates.plone = 3.5.1
+mr.bob = 0.1.2
+regex = 2018.8.29
+
+# Required by:
+# bobtemplates.plone==3.5.1
+case-conversion = 2.1.0
+
+# Required by:
+# bobtemplates.plone==3.5.1
+python-slugify = 1.2.6
+
+Products.DocFinderTab = 1.0.5
+collective.checkdocs = 0.2
+zest.pocompile = 1.4
+
+# Required by:
+# bobtemplates.plone==3.5.1
+# zest.releaser==6.15.0
+colorama = 0.4.0
diff --git a/plone_alpine/docker-entrypoint.sh b/plone_alpine/docker-entrypoint.sh
index 98351b1..ee6b4f9 100755
--- a/plone_alpine/docker-entrypoint.sh
+++ b/plone_alpine/docker-entrypoint.sh
@@ -9,7 +9,7 @@ su-exec plone python /docker-initialize.py
if [ -e "custom.cfg" ]; then
if [ ! -e "bin/develop" ]; then
- su-exec plone bin/buildout -c custom.cfg
+ su-exec plone buildout -c custom.cfg
su-exec plone python /docker-initialize.py
fi
fi
diff --git a/plone_latest/Dockerfile b/plone_latest/Dockerfile
index d809cef..ff7e3c9 100644
--- a/plone_latest/Dockerfile
+++ b/plone_latest/Dockerfile
@@ -1,11 +1,12 @@
FROM python:2.7-slim-stretch
ENV PIP=9.0.3 \
- ZC_BUILDOUT=2.11.2 \
- SETUPTOOLS=38.7.0 \
+ ZC_BUILDOUT=2.11.4 \
+ SETUPTOOLS=39.1.0 \
+ WHEEL=0.31.1 \
PLONE_MAJOR=5.1 \
- PLONE_VERSION=5.1.2 \
- PLONE_MD5=e34790cea362b8db6a8ffe30854c6fc3
+ PLONE_VERSION=5.1.4 \
+ PLONE_MD5=ce3b87b1cb8ee30e577ae347d9bdd647
LABEL plone=$PLONE_VERSION \
os="debian" \
@@ -28,12 +29,9 @@ RUN buildDeps="dpkg-dev gcc libbz2-dev libc6-dev libjpeg62-turbo-dev libopenjp2-
&& tar -xzf Plone.tgz \
&& cp -rv ./Plone-$PLONE_VERSION-UnifiedInstaller/base_skeleton/* /plone/instance/ \
&& cp -v ./Plone-$PLONE_VERSION-UnifiedInstaller/buildout_templates/buildout.cfg /plone/instance/buildout-base.cfg \
- && pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT \
+ && pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT wheel==$WHEEL \
&& cd /plone/instance \
&& buildout \
- && ln -s /usr/local/bin/pip /plone/instance/bin/pip \
- && ln -s /usr/local/bin/python /plone/instance/bin/python \
- && ln -s /usr/local/bin/buildout /plone/instance/bin/buildout \
&& ln -s /data/filestorage/ /plone/instance/var/filestorage \
&& ln -s /data/blobstorage /plone/instance/var/blobstorage \
&& chown -R plone:plone /plone /data \
diff --git a/plone_latest/buildout.cfg b/plone_latest/buildout.cfg
index 43c59c7..848b40a 100644
--- a/plone_latest/buildout.cfg
+++ b/plone_latest/buildout.cfg
@@ -11,6 +11,7 @@ var-dir=/data
user=admin:admin
parts +=
zeo
+ mrbob
[client1]
recipe =
@@ -20,12 +21,43 @@ recipe =
recipe = plone.recipe.zeoserver
zeo-address = 8080
+# Requires gcc, thus install it on image build
+[mrbob]
+recipe = zc.recipe.egg
+eggs =
+ mr.bob
+ bobtemplates.plone
+
[versions]
setuptools =
zc.buildout =
-Pillow = 4.3.0
+# The following part definition lists the versions picked:
+Pillow = 5.3.0
buildout.wheel = 0.2.0
plone.recipe.command = 1.1
plone.recipe.precompiler = 0.6
collective.recipe.backup = 4.0.1
+Unidecode = 0.04.16
+
+MarkupSafe = 1.0
+bobtemplates.plone = 3.5.1
+mr.bob = 0.1.2
+regex = 2018.8.29
+
+# Required by:
+# bobtemplates.plone==3.5.1
+case-conversion = 2.1.0
+
+# Required by:
+# bobtemplates.plone==3.5.1
+python-slugify = 1.2.6
+
+Products.DocFinderTab = 1.0.5
+collective.checkdocs = 0.2
+zest.pocompile = 1.4
+
+# Required by:
+# bobtemplates.plone==3.5.1
+# zest.releaser==6.15.0
+colorama = 0.4.0
diff --git a/plone_latest/docker-entrypoint.sh b/plone_latest/docker-entrypoint.sh
index 1d03b26..07c3968 100755
--- a/plone_latest/docker-entrypoint.sh
+++ b/plone_latest/docker-entrypoint.sh
@@ -9,7 +9,7 @@ gosu plone python /docker-initialize.py
if [ -e "custom.cfg" ]; then
if [ ! -e "bin/develop" ]; then
- gosu plone bin/buildout -c custom.cfg
+ gosu plone buildout -c custom.cfg
gosu plone python /docker-initialize.py
fi
fi |
|
Build test of #5014; 7ed8820; $ bashbrew build plone:5.1.4
Building bashbrew/cache:9bd5e0bc125d96dc4fc58a2f6a7185e1d60ce11e1b21a01021c1809b96c7675d (plone:5.1.4)
Tagging plone:5.1.4
Tagging plone:5.1
Tagging plone:5
Tagging plone:latest
$ test/run.sh plone:5.1.4
testing plone:5.1.4
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'plone-basics' [5/7]....passed
'plone-addons' [6/7]...passed
'plone-zeoclient' [7/7]...passed
$ bashbrew build plone:5.1.4-alpine
Building bashbrew/cache:310864aa37b5458e86788f19137e890793b2d4a9f37c1e52ee9819e9956270a2 (plone:5.1.4-alpine)
Tagging plone:5.1.4-alpine
Tagging plone:5.1-alpine
Tagging plone:5-alpine
Tagging plone:alpine
$ test/run.sh plone:5.1.4-alpine
testing plone:5.1.4-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'plone-basics' [5/7]....passed
'plone-addons' [6/7]...passed
'plone-zeoclient' [7/7]....passed
$ bashbrew build plone:4.3.18
Building bashbrew/cache:ea790bccf5782b364d6dae79a5096a4f525f1cae9ace355ff539ca84224c00d2 (plone:4.3.18)
Tagging plone:4.3.18
Tagging plone:4.3
Tagging plone:4
$ test/run.sh plone:4.3.18
testing plone:4.3.18
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'plone-basics' [5/7]....passed
'plone-addons' [6/7]...passed
'plone-zeoclient' [7/7]....passed
$ bashbrew build plone:4.3.18-alpine
Building bashbrew/cache:771cc78c84ebc6c7f1b1559af38ed20f2f0b215a92002b70220b834499ac1ecb (plone:4.3.18-alpine)
Tagging plone:4.3.18-alpine
Tagging plone:4.3-alpine
Tagging plone:4-alpine
$ test/run.sh plone:4.3.18-alpine
testing plone:4.3.18-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'plone-basics' [5/7]....passed
'plone-addons' [6/7]...passed
'plone-zeoclient' [7/7]....passed
|
This was referenced Nov 6, 2018
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.
No description provided.