Merge pull request #4164 from avoinea/master

Release Plone 5.1

library/plone

@@ -3,10 +3,32 @@ Maintainers: Alin Voinea <[email protected]> (@avoinea),
              Antonio De Marinis <[email protected]> (@demarant)
 GitRepo: https://github.com/plone/plone.docker.git
 
-Tags: 5.0.8, 5.0, 5, latest
-GitCommit: 61cce5aaee119c3aa912529738195fc3881cc37e
-Directory: 5.0/5.0.8/debian
+Tags: 5.1.1, 5.1, 5, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: f623df367e5f065d07a3c2f6db44c73154fb70c8
+Directory: 5.1/5.1.1/debian
 
-Tags: 4.3.15, 4.3, 4
-GitCommit: 127622cb51ecb927e79050654ff1fcfb927910bb
-Directory: 4.3/4.3.15/debian
+Tags: 5.1.1-alpine, 5.1-alpine, 5-alpine, alpine
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: f623df367e5f065d07a3c2f6db44c73154fb70c8
+Directory: 5.1/5.1.1/alpine
+
+Tags: 5.1.0
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: f623df367e5f065d07a3c2f6db44c73154fb70c8
+Directory: 5.1/5.1.0/debian
+
+Tags: 5.1.0-alpine
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: f623df367e5f065d07a3c2f6db44c73154fb70c8
+Directory: 5.1/5.1.0/alpine
+
+Tags: 4.3.17, 4.3, 4
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: f623df367e5f065d07a3c2f6db44c73154fb70c8
+Directory: 4.3/4.3.17/debian
+
+Tags: 4.3.17-alpine, 4.3-alpine, 4-alpine
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: f623df367e5f065d07a3c2f6db44c73154fb70c8
+Directory: 4.3/4.3.17/alpine

test/tests/plone-zeoclient/run.sh

@@ -10,11 +10,11 @@ PLONE_TEST_TRIES=5
 
 # Start ZEO server
 zname="zeo-container-$RANDOM-$RANDOM"
-zid="$(docker run -d --name "$zname" "$image" zeoserver)"
+zid="$(docker run -d --name "$zname" "$image" zeo)"
 
 # Start Plone as ZEO Client
 pname="plone-container-$RANDOM-$RANDOM"
-pid="$(docker run -d --name "$pname" --link=$zname:zeo -e ZEO_ADDRESS=zeo:8100 "$image")"
+pid="$(docker run -d --name "$pname" --link=$zname:zeo -e ZEO_ADDRESS=zeo:8080 "$image")"
 
 # Tear down
 trap "docker rm -vf $pid $zid > /dev/null" EXIT
@@ -41,4 +41,4 @@ get_auth() {
 [[ "$(get 'http://plone:8080')" == *"Plone is up and running"* ]]
 
 # Create a Plone site
-[[ "$(get_auth 'http://plone:8080/@@plone-addsite' "$(echo -n 'admin:admin' | base64)")" == *"Create a Plone site"* ]]
+[[ "$(get_auth 'http://plone:8080/@@plone-addsite' "$(echo -n 'admin:admin' | base64)")" == *"Create a Plone site"* ]]