From 061bfe7c41f24d7cdd791f9b180868b03dc1166f Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Wed, 10 Feb 2016 17:52:45 +0200
Subject: [PATCH 01/19] Add Plone

---
 library/plone | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 library/plone

diff --git a/library/plone b/library/plone
new file mode 100644
index 0000000000000..c8139e243658a
--- /dev/null
+++ b/library/plone
@@ -0,0 +1,19 @@
+# maintainer: Plone Community contact@plone.org @plone
+
+4.3.7: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/debian
+4.3: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/debian
+4: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/debian
+
+4.3.7-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/alpine
+4.3-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/alpine
+4-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/alpine
+
+5.0.2: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
+5.0: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
+5: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
+latest: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
+
+5.0.2-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
+5.0-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
+5-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
+alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine

From a8efb5a7a76da7fba2798361a013598d911afec5 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Thu, 11 Feb 2016 12:06:51 +0200
Subject: [PATCH 02/19] Update to the latest stable revision

---
 library/plone | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/library/plone b/library/plone
index c8139e243658a..c25fe8c393c39 100644
--- a/library/plone
+++ b/library/plone
@@ -1,19 +1,19 @@
 # maintainer: Plone Community contact@plone.org @plone
 
-4.3.7: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/debian
-4.3: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/debian
-4: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/debian
+4.3.7: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/debian
+4.3: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/debian
+4: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/debian
 
-4.3.7-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/alpine
-4.3-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/alpine
-4-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 4.3/4.3.7/alpine
+4.3.7-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/alpine
+4.3-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/alpine
+4-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/alpine
 
-5.0.2: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
-5.0: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
-5: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
-latest: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/debian
+5.0.2: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
+5.0: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
+5: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
+latest: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
 
-5.0.2-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
-5.0-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
-5-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
-alpine: git://github.com/plone/plone.docker@afba49d46c9e37a6b31fffbd7f89699662fe077a 5.0/5.0.2/alpine
+5.0.2-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine
+5.0-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine
+5-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine
+alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine

From b2137cea25746ca485961aa96b086cd0f3a9e9fe Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Thu, 11 Feb 2016 18:17:52 +0200
Subject: [PATCH 03/19] Remove 5 alpine tags until we have a fix for
 plone/plone.docker#16

---
 library/plone | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/library/plone b/library/plone
index c25fe8c393c39..7b063cf8a22af 100644
--- a/library/plone
+++ b/library/plone
@@ -12,8 +12,3 @@
 5.0: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
 5: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
 latest: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
-
-5.0.2-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine
-5.0-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine
-5-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine
-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/alpine

From e3ca8226ce4049000c0e9b8b00d7280ec249bfb6 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Thu, 3 Mar 2016 15:51:13 +0200
Subject: [PATCH 04/19] Update to the latest repo version. Remove bugous alpine
 tags.

---
 library/plone | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/library/plone b/library/plone
index 7b063cf8a22af..133cf91ba76b8 100644
--- a/library/plone
+++ b/library/plone
@@ -1,14 +1,10 @@
 # maintainer: Plone Community contact@plone.org @plone
 
-4.3.7: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/debian
-4.3: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/debian
-4: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/debian
+4.3.7: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 4.3/4.3.7/debian
+4.3: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 4.3/4.3.7/debian
+4: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 4.3/4.3.7/debian
 
-4.3.7-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/alpine
-4.3-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/alpine
-4-alpine: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 4.3/4.3.7/alpine
-
-5.0.2: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
-5.0: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
-5: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
-latest: git://github.com/plone/plone.docker@020f9210a5480f35c22970ed640c32038e04c945 5.0/5.0.2/debian
+5.0.2: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
+5.0: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
+5: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
+latest: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian

From 1fd05ef3bfa489e2c7049fbcc5e379f72c36e558 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Thu, 17 Mar 2016 17:05:17 +0200
Subject: [PATCH 05/19] Release Plone 4.3.8

---
 library/plone | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/library/plone b/library/plone
index 133cf91ba76b8..823725c30e0d9 100644
--- a/library/plone
+++ b/library/plone
@@ -1,10 +1,12 @@
 # maintainer: Plone Community contact@plone.org @plone
 
-4.3.7: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 4.3/4.3.7/debian
-4.3: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 4.3/4.3.7/debian
-4: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 4.3/4.3.7/debian
+5.0.2: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
+5.0: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
+5: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
+latest: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
 
-5.0.2: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
-5.0: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
-5: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
-latest: git://github.com/plone/plone.docker@f723940ccb0b565331bc0cc56c502cc45b184976 5.0/5.0.2/debian
+4.3.8: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.8/debian
+4.3: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.8/debian
+4: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.8/debian
+
+4.3.7: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.7/debian

From 72a531254edd64b00cdf7a391dde62fa987a3b7f Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Wed, 30 Mar 2016 19:16:46 +0300
Subject: [PATCH 06/19] Release Plone 5.0.3

---
 library/plone | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/library/plone b/library/plone
index 823725c30e0d9..4180672f01447 100644
--- a/library/plone
+++ b/library/plone
@@ -1,12 +1,14 @@
-# maintainer: Plone Community contact@plone.org @plone
+# maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
 
-5.0.2: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
-5.0: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
-5: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
-latest: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 5.0/5.0.2/debian
+5.0.3: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
+5.0: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
+5: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
+latest: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
 
-4.3.8: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.8/debian
-4.3: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.8/debian
-4: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.8/debian
+5.0.2: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.2/debian
 
-4.3.7: git://github.com/plone/plone.docker@7b0a7fbce84209f309bea7337db4b4fe85f168b2 4.3/4.3.7/debian
+4.3.8: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.8/debian
+4.3: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.8/debian
+4: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.8/debian
+
+4.3.7: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.7/debian

From 4058b5ebd670dd0e2bcd1cc338b560452fc6e8d0 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Thu, 7 Apr 2016 11:34:07 +0300
Subject: [PATCH 07/19] Release Plone 4.3.9 and 5.0.4

---
 library/plone | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/library/plone b/library/plone
index 4180672f01447..e035f052df584 100644
--- a/library/plone
+++ b/library/plone
@@ -1,14 +1,16 @@
 # maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
 
-5.0.3: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
-5.0: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
-5: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
-latest: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.3/debian
+5.0.4: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
+5.0: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
+5: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
+latest: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
 
-5.0.2: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 5.0/5.0.2/debian
+5.0.3: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.3/debian
+5.0.2: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.2/debian
 
-4.3.8: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.8/debian
-4.3: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.8/debian
-4: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.8/debian
+4.3.9: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.9/debian
+4.3: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.9/debian
+4: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.9/debian
 
-4.3.7: git://github.com/plone/plone.docker@51e2d563b7c1471c0c094260c7baec915a6f3106 4.3/4.3.7/debian
+4.3.8: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.8/debian
+4.3.7: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.7/debian

From 2c76a7e5ef5c553db607c63cc0ee00bb749bf664 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Wed, 13 Apr 2016 20:40:37 +0300
Subject: [PATCH 08/19] Add built-in support for ZEO clustering

---
 library/plone | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/library/plone b/library/plone
index e035f052df584..87709c1ba62a8 100644
--- a/library/plone
+++ b/library/plone
@@ -1,16 +1,16 @@
 # maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
 
-5.0.4: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
-5.0: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
-5: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
-latest: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.4/debian
+5.0.4: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
+5.0: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
+5: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
+latest: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
 
-5.0.3: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.3/debian
-5.0.2: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 5.0/5.0.2/debian
+5.0.3: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.3/debian
+5.0.2: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.2/debian
 
-4.3.9: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.9/debian
-4.3: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.9/debian
-4: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.9/debian
+4.3.9: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.9/debian
+4.3: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.9/debian
+4: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.9/debian
 
-4.3.8: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.8/debian
-4.3.7: git://github.com/plone/plone.docker@641ff339611954173836b4de16ccc7495f40ec77 4.3/4.3.7/debian
+4.3.8: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.8/debian
+4.3.7: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.7/debian

From 4712bba2caa88fd2a5dfa0ceb695e2f6cf7ef34d Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Mon, 18 Jul 2016 12:37:24 +0300
Subject: [PATCH 09/19] Release Plone 4.3.10 and 5.0.5

---
 library/plone | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/library/plone b/library/plone
index 87709c1ba62a8..241a5b1d20933 100644
--- a/library/plone
+++ b/library/plone
@@ -1,16 +1,18 @@
 # maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
 
-5.0.4: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
-5.0: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
-5: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
-latest: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.4/debian
+5.0.5: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.5/debian
+5.0: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
+5: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
+latest: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
 
-5.0.3: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.3/debian
-5.0.2: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 5.0/5.0.2/debian
+5.0.4: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
+5.0.3: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.3/debian
+5.0.2: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.2/debian
 
-4.3.9: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.9/debian
-4.3: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.9/debian
-4: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.9/debian
+4.3.10: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.10/debian
+4.3: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.9/debian
+4: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.9/debian
 
-4.3.8: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.8/debian
-4.3.7: git://github.com/plone/plone.docker@0bcd73ee844c5b8932160882a277afa2dd1728a9 4.3/4.3.7/debian
+4.3.9: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.9/debian
+4.3.8: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.8/debian
+4.3.7: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.7/debian

From cd7fd82e3fe95e9686f9f7ed796fa31846d97c22 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Wed, 20 Jul 2016 12:43:54 +0300
Subject: [PATCH 10/19] Add missing dependency for backup: rsync

---
 library/plone | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/plone b/library/plone
index 241a5b1d20933..b2d5761a46473 100644
--- a/library/plone
+++ b/library/plone
@@ -1,18 +1,18 @@
 # maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
 
-5.0.5: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.5/debian
-5.0: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
-5: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
-latest: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
+5.0.5: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.5/debian
+5.0: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
+5: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
+latest: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
 
-5.0.4: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.4/debian
-5.0.3: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.3/debian
-5.0.2: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 5.0/5.0.2/debian
+5.0.4: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
+5.0.3: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.3/debian
+5.0.2: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.2/debian
 
-4.3.10: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.10/debian
-4.3: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.9/debian
-4: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.9/debian
+4.3.10: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.10/debian
+4.3: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.9/debian
+4: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.9/debian
 
-4.3.9: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.9/debian
-4.3.8: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.8/debian
-4.3.7: git://github.com/plone/plone.docker@ef6d73fca8e3df5de1fac73b8b9c842a376c28a9 4.3/4.3.7/debian
+4.3.9: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.9/debian
+4.3.8: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.8/debian
+4.3.7: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.7/debian

From 32a89f103f29a485e7a86782fb0bd2b18d6fd6e8 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Mon, 19 Sep 2016 15:39:56 +0300
Subject: [PATCH 11/19] Fix docker-entrypoint to watch main process instead of
 the logging one

---
 library/plone | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/plone b/library/plone
index b2d5761a46473..6d9989219d5a7 100644
--- a/library/plone
+++ b/library/plone
@@ -1,18 +1,18 @@
 # maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
 
-5.0.5: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.5/debian
-5.0: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
-5: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
-latest: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
+5.0.5: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.5/debian
+5.0: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
+5: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
+latest: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
 
-5.0.4: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.4/debian
-5.0.3: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.3/debian
-5.0.2: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 5.0/5.0.2/debian
+5.0.4: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
+5.0.3: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.3/debian
+5.0.2: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.2/debian
 
-4.3.10: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.10/debian
-4.3: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.9/debian
-4: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.9/debian
+4.3.10: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.10/debian
+4.3: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.9/debian
+4: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.9/debian
 
-4.3.9: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.9/debian
-4.3.8: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.8/debian
-4.3.7: git://github.com/plone/plone.docker@4c1e0320b3319bdbf6f3ef57e1260b3ea685a56c 4.3/4.3.7/debian
+4.3.9: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.9/debian
+4.3.8: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.8/debian
+4.3.7: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.7/debian

From c4ec04451ff11cbcae807457c382c919b17b8926 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Mon, 19 Sep 2016 16:18:37 +0300
Subject: [PATCH 12/19] Update to new format

---
 library/plone | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/library/plone b/library/plone
index 6d9989219d5a7..8ca4a39f2f9c2 100644
--- a/library/plone
+++ b/library/plone
@@ -1,18 +1,35 @@
-# maintainer: Alin Voinea alin.voinea@gmail.com @avoinea
+Maintainers: Alin Voinea alin.voinea@gmail.com (@avoinea),
+             Sven Strack sven@so36.net (@svx)
+GitRepo: https://github.com/plone/plone.docker.git
 
-5.0.5: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.5/debian
-5.0: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
-5: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
-latest: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
+Tags: 5.0.5, 5.0, 5, latest
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 5.0/5.0.5/debian
 
-5.0.4: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.4/debian
-5.0.3: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.3/debian
-5.0.2: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 5.0/5.0.2/debian
+Tags: 5.0.4
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 5.0/5.0.4/debian
 
-4.3.10: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.10/debian
-4.3: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.9/debian
-4: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.9/debian
+Tags: 5.0.3
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 5.0/5.0.3/debian
 
-4.3.9: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.9/debian
-4.3.8: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.8/debian
-4.3.7: git://github.com/plone/plone.docker@5f28556f33cee85d0d06e2892fa3f2be3ab10f53 4.3/4.3.7/debian
+Tags: 5.0.2
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 5.0/5.0.2/debian
+
+Tags: 4.3.10, 4.3, 4
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 4.3/4.3.10/debian
+
+Tags: 4.3.9
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 4.3/4.3.9/debian
+
+Tags: 4.3.8
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 4.3/4.3.8/debian
+
+Tags: 4.3.7
+GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+Directory: 4.3/4.3.7/debian

From f2a19b8f51ae257b2af94e3ed581a3453e58d5a5 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Mon, 19 Sep 2016 20:05:33 +0300
Subject: [PATCH 13/19] Add Plone tests

---
 test/config.sh                               |  5 +++
 test/tests/plone-addons/expected-std-out.txt |  6 +++
 test/tests/plone-addons/run.sh               | 13 ++++++
 test/tests/plone-basics/run.sh               | 38 +++++++++++++++++
 test/tests/plone-zeoclient/run.sh            | 44 ++++++++++++++++++++
 5 files changed, 106 insertions(+)
 create mode 100644 test/tests/plone-addons/expected-std-out.txt
 create mode 100755 test/tests/plone-addons/run.sh
 create mode 100755 test/tests/plone-basics/run.sh
 create mode 100755 test/tests/plone-zeoclient/run.sh

diff --git a/test/config.sh b/test/config.sh
index 6cad49f3cea5e..7bce1d01bba87 100644
--- a/test/config.sh
+++ b/test/config.sh
@@ -130,6 +130,11 @@ imageTests+=(
 	[php:fpm]='
 		php-fpm-hello-web
 	'
+	[plone]='
+		plone-basics
+		plone-addons
+		plone-zeoclient
+	'
 	[postgres]='
 		postgres-basics
 		postgres-initdb
diff --git a/test/tests/plone-addons/expected-std-out.txt b/test/tests/plone-addons/expected-std-out.txt
new file mode 100644
index 0000000000000..ff78116c980c8
--- /dev/null
+++ b/test/tests/plone-addons/expected-std-out.txt
@@ -0,0 +1,6 @@
+
+[buildout]
+extends = develop.cfg
+develop += src/eea.facetednavigation
+eggs += eea.facetednavigation
+zcml += eea.facetednavigation-meta
diff --git a/test/tests/plone-addons/run.sh b/test/tests/plone-addons/run.sh
new file mode 100755
index 0000000000000..13acd2fc027e7
--- /dev/null
+++ b/test/tests/plone-addons/run.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -eo pipefail
+
+image="$1"
+
+PLONE_TEST_SLEEP=3
+PLONE_TEST_TRIES=5
+
+cname="plone-container-$RANDOM-$RANDOM"
+cid="$(docker run -d -e BUILDOUT_DEVELOP=src/eea.facetednavigation -e BUILDOUT_EGGS=eea.facetednavigation -e BUILDOUT_ZCML=eea.facetednavigation-meta --name "$cname" "$image" cat)"
+trap "docker rm -vf $cid > /dev/null" EXIT
+
+docker exec -it "$cname" cat custom.cfg
diff --git a/test/tests/plone-basics/run.sh b/test/tests/plone-basics/run.sh
new file mode 100755
index 0000000000000..da8dd30316f0d
--- /dev/null
+++ b/test/tests/plone-basics/run.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -eo pipefail
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+PLONE_TEST_SLEEP=3
+PLONE_TEST_TRIES=5
+
+cname="plone-container-$RANDOM-$RANDOM"
+cid="$(docker run -d --name "$cname" "$image")"
+trap "docker rm -vf $cid > /dev/null" EXIT
+
+get() {
+  docker run --rm -i \
+             --link "$cname":plone \
+             --entrypoint python \
+                "$image" \
+                -c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
+}
+
+get_auth() {
+  docker run --rm -i \
+             --link "$cname":plone \
+             --entrypoint python \
+                "$image" \
+                -c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
+}
+
+
+. "$dir/../../retry.sh" --tries "$PLONE_TEST_TRIES" --sleep "$PLONE_TEST_SLEEP" get "http://plone:8080"
+
+# Plone is up and running
+[[ $(get 'http://plone:8080') == *"Plone is up and running"* ]]
+
+# Create a Plone site
+[[ $(get_auth 'http://plone:8080/@@plone-addsite' 'YWRtaW46YWRtaW4=') == *"Create a Plone site"* ]]
diff --git a/test/tests/plone-zeoclient/run.sh b/test/tests/plone-zeoclient/run.sh
new file mode 100755
index 0000000000000..de9634ff067f3
--- /dev/null
+++ b/test/tests/plone-zeoclient/run.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+set -eo pipefail
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+PLONE_TEST_SLEEP=3
+PLONE_TEST_TRIES=5
+
+# Start ZEO server
+zname="zeo-container-$RANDOM-$RANDOM"
+zid="$(docker run -d --name "$zname" "$image" zeoserver)"
+
+# 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")"
+
+# Tear down
+trap "docker rm -vf $pid $zid > /dev/null" EXIT
+
+get() {
+  docker run --rm -i \
+             --link "$pname":plone \
+             --entrypoint python \
+                "$image" \
+                -c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
+}
+
+get_auth() {
+  docker run --rm -i \
+             --link "$pname":plone \
+             --entrypoint python \
+                "$image" \
+                -c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
+}
+
+. "$dir/../../retry.sh" --tries "$PLONE_TEST_TRIES" --sleep "$PLONE_TEST_SLEEP" get "http://plone:8080"
+
+# Plone is up and running
+[[ $(get 'http://plone:8080') == *"Plone is up and running"* ]]
+
+# Create a Plone site
+[[ $(get_auth 'http://plone:8080/@@plone-addsite' 'YWRtaW46YWRtaW4=') == *"Create a Plone site"* ]]

From d87c01b88bd79167eea7fc430f5804a5a7cc77ea Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Wed, 21 Sep 2016 15:42:37 +0300
Subject: [PATCH 14/19] Update with the latest fixes

---
 library/plone | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/plone b/library/plone
index 8ca4a39f2f9c2..8e11df8615889 100644
--- a/library/plone
+++ b/library/plone
@@ -3,33 +3,33 @@ Maintainers: Alin Voinea alin.voinea@gmail.com (@avoinea),
 GitRepo: https://github.com/plone/plone.docker.git
 
 Tags: 5.0.5, 5.0, 5, latest
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 5.0/5.0.5/debian
 
 Tags: 5.0.4
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 5.0/5.0.4/debian
 
 Tags: 5.0.3
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 5.0/5.0.3/debian
 
 Tags: 5.0.2
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 5.0/5.0.2/debian
 
 Tags: 4.3.10, 4.3, 4
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 4.3/4.3.10/debian
 
 Tags: 4.3.9
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 4.3/4.3.9/debian
 
 Tags: 4.3.8
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 4.3/4.3.8/debian
 
 Tags: 4.3.7
-GitCommit: 5f28556f33cee85d0d06e2892fa3f2be3ab10f53
+GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
 Directory: 4.3/4.3.7/debian

From 014e8224da83fda51a8c6d6146ce58a932ef468b Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Wed, 28 Sep 2016 16:56:51 +0300
Subject: [PATCH 15/19] Release 4.3.11 and 5.0.6

---
 library/plone | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/library/plone b/library/plone
index 8e11df8615889..743c2a6bfa0c3 100644
--- a/library/plone
+++ b/library/plone
@@ -2,34 +2,42 @@ Maintainers: Alin Voinea alin.voinea@gmail.com (@avoinea),
              Sven Strack sven@so36.net (@svx)
 GitRepo: https://github.com/plone/plone.docker.git
 
-Tags: 5.0.5, 5.0, 5, latest
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+Tags: 5.0.6, 5.0, 5, latest
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+Directory: 5.0/5.0.6/debian
+
+Tags: 5.0.5
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 5.0/5.0.5/debian
 
 Tags: 5.0.4
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 5.0/5.0.4/debian
 
 Tags: 5.0.3
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 5.0/5.0.3/debian
 
 Tags: 5.0.2
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 5.0/5.0.2/debian
 
-Tags: 4.3.10, 4.3, 4
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+Tags: 4.3.11, 4.3, 4
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+Directory: 4.3/4.3.11/debian
+
+Tags: 4.3.10
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 4.3/4.3.10/debian
 
 Tags: 4.3.9
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 4.3/4.3.9/debian
 
 Tags: 4.3.8
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 4.3/4.3.8/debian
 
 Tags: 4.3.7
-GitCommit: 53f21bf3ba875ba191b2e3baef8133a6b5233ce6
+GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
 Directory: 4.3/4.3.7/debian

From ddb1c2e0eb50e0dc4ca4be92e8b29994bcd98a9d Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin.voinea@gmail.com>
Date: Thu, 6 Oct 2016 23:41:54 +0300
Subject: [PATCH 16/19] Make Add-ons environment variable more user friendly

* Rename BUILDOUT_EGGS -> PLONE_ADDONS, ADDONS
* Rename BUILDOUT_ZCML -> PLONE_ZCML, ZCML
* Rename BUILDOUT_DEVELOP -> PLONE_DEVELOP, DEVELOP
* Add Deprecation Warnings for renamed env variables
---
 library/plone                  | 20 ++++++++++----------
 test/tests/plone-addons/run.sh |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/library/plone b/library/plone
index 743c2a6bfa0c3..a2c2ffe6cce7c 100644
--- a/library/plone
+++ b/library/plone
@@ -3,41 +3,41 @@ Maintainers: Alin Voinea alin.voinea@gmail.com (@avoinea),
 GitRepo: https://github.com/plone/plone.docker.git
 
 Tags: 5.0.6, 5.0, 5, latest
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 5.0/5.0.6/debian
 
 Tags: 5.0.5
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 5.0/5.0.5/debian
 
 Tags: 5.0.4
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 5.0/5.0.4/debian
 
 Tags: 5.0.3
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 5.0/5.0.3/debian
 
 Tags: 5.0.2
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 5.0/5.0.2/debian
 
 Tags: 4.3.11, 4.3, 4
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 4.3/4.3.11/debian
 
 Tags: 4.3.10
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 4.3/4.3.10/debian
 
 Tags: 4.3.9
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 4.3/4.3.9/debian
 
 Tags: 4.3.8
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 4.3/4.3.8/debian
 
 Tags: 4.3.7
-GitCommit: dced1a1faeed0ab12479859f2807029c2928d284
+GitCommit: 443c34c35e774820621bf5c0966c81c3b45cb284
 Directory: 4.3/4.3.7/debian
diff --git a/test/tests/plone-addons/run.sh b/test/tests/plone-addons/run.sh
index 13acd2fc027e7..78e07b17c9937 100755
--- a/test/tests/plone-addons/run.sh
+++ b/test/tests/plone-addons/run.sh
@@ -7,7 +7,7 @@ PLONE_TEST_SLEEP=3
 PLONE_TEST_TRIES=5
 
 cname="plone-container-$RANDOM-$RANDOM"
-cid="$(docker run -d -e BUILDOUT_DEVELOP=src/eea.facetednavigation -e BUILDOUT_EGGS=eea.facetednavigation -e BUILDOUT_ZCML=eea.facetednavigation-meta --name "$cname" "$image" cat)"
+cid="$(docker run -d -e PLONE_DEVELOP=src/eea.facetednavigation -e PLONE_ADDONS=eea.facetednavigation -e PLONE_ZCML=eea.facetednavigation-meta --name "$cname" "$image" cat)"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 docker exec -it "$cname" cat custom.cfg

From dce1897e4741e2df8811663b955fdd622771fbf6 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin.voinea@gmail.com>
Date: Sat, 8 Oct 2016 15:16:13 +0300
Subject: [PATCH 17/19] Fix issues reported by @tianon

---
 library/plone                     |  4 ++--
 test/tests/plone-addons/run.sh    |  5 +----
 test/tests/plone-basics/run.sh    | 24 ++++++++++++------------
 test/tests/plone-zeoclient/run.sh | 24 ++++++++++++------------
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/library/plone b/library/plone
index a2c2ffe6cce7c..2506dbe071e7c 100644
--- a/library/plone
+++ b/library/plone
@@ -1,5 +1,5 @@
-Maintainers: Alin Voinea alin.voinea@gmail.com (@avoinea),
-             Sven Strack sven@so36.net (@svx)
+Maintainers: Alin Voinea <alin.voinea@gmail.com> (@avoinea),
+             Sven Strack <sven@so36.net> (@svx)
 GitRepo: https://github.com/plone/plone.docker.git
 
 Tags: 5.0.6, 5.0, 5, latest
diff --git a/test/tests/plone-addons/run.sh b/test/tests/plone-addons/run.sh
index 78e07b17c9937..b0cd4d28fa45f 100755
--- a/test/tests/plone-addons/run.sh
+++ b/test/tests/plone-addons/run.sh
@@ -3,11 +3,8 @@ set -eo pipefail
 
 image="$1"
 
-PLONE_TEST_SLEEP=3
-PLONE_TEST_TRIES=5
-
 cname="plone-container-$RANDOM-$RANDOM"
 cid="$(docker run -d -e PLONE_DEVELOP=src/eea.facetednavigation -e PLONE_ADDONS=eea.facetednavigation -e PLONE_ZCML=eea.facetednavigation-meta --name "$cname" "$image" cat)"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
-docker exec -it "$cname" cat custom.cfg
+docker exec "$cname" cat custom.cfg
diff --git a/test/tests/plone-basics/run.sh b/test/tests/plone-basics/run.sh
index da8dd30316f0d..8d4b1bf93296d 100755
--- a/test/tests/plone-basics/run.sh
+++ b/test/tests/plone-basics/run.sh
@@ -13,26 +13,26 @@ cid="$(docker run -d --name "$cname" "$image")"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 get() {
-  docker run --rm -i \
-             --link "$cname":plone \
-             --entrypoint python \
-                "$image" \
-                -c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
+	docker run --rm -i \
+		--link "$cname":plone \
+		--entrypoint python \
+		"$image" \
+		-c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
 }
 
 get_auth() {
-  docker run --rm -i \
-             --link "$cname":plone \
-             --entrypoint python \
-                "$image" \
-                -c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
+	docker run --rm -i \
+		--link "$cname":plone \
+		--entrypoint python \
+		"$image" \
+		-c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
 }
 
 
 . "$dir/../../retry.sh" --tries "$PLONE_TEST_TRIES" --sleep "$PLONE_TEST_SLEEP" get "http://plone:8080"
 
 # Plone is up and running
-[[ $(get 'http://plone:8080') == *"Plone is up and running"* ]]
+[[ "$(get 'http://plone:8080')" == *"Plone is up and running"* ]]
 
 # Create a Plone site
-[[ $(get_auth 'http://plone:8080/@@plone-addsite' 'YWRtaW46YWRtaW4=') == *"Create a Plone site"* ]]
+[[ "$(get_auth 'http://plone:8080/@@plone-addsite' "$(echo -n 'admin:admin' | base64)")" == *"Create a Plone site"* ]]
\ No newline at end of file
diff --git a/test/tests/plone-zeoclient/run.sh b/test/tests/plone-zeoclient/run.sh
index de9634ff067f3..0e0ae247f3629 100755
--- a/test/tests/plone-zeoclient/run.sh
+++ b/test/tests/plone-zeoclient/run.sh
@@ -20,25 +20,25 @@ pid="$(docker run -d --name "$pname" --link=$zname:zeo -e ZEO_ADDRESS=zeo:8100 "
 trap "docker rm -vf $pid $zid > /dev/null" EXIT
 
 get() {
-  docker run --rm -i \
-             --link "$pname":plone \
-             --entrypoint python \
-                "$image" \
-                -c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
+	docker run --rm -i \
+		--link "$pname":plone \
+		--entrypoint python \
+		"$image" \
+		-c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
 }
 
 get_auth() {
-  docker run --rm -i \
-             --link "$pname":plone \
-             --entrypoint python \
-                "$image" \
-                -c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
+	docker run --rm -i \
+		--link "$pname":plone \
+		--entrypoint python \
+		"$image" \
+		-c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
 }
 
 . "$dir/../../retry.sh" --tries "$PLONE_TEST_TRIES" --sleep "$PLONE_TEST_SLEEP" get "http://plone:8080"
 
 # Plone is up and running
-[[ $(get 'http://plone:8080') == *"Plone is up and running"* ]]
+[[ "$(get 'http://plone:8080')" == *"Plone is up and running"* ]]
 
 # Create a Plone site
-[[ $(get_auth 'http://plone:8080/@@plone-addsite' 'YWRtaW46YWRtaW4=') == *"Create a Plone site"* ]]
+[[ "$(get_auth 'http://plone:8080/@@plone-addsite' "$(echo -n 'admin:admin' | base64)")" == *"Create a Plone site"* ]]
\ No newline at end of file

From bfd74b969cf0687c7260ce166d029deda489d89c Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Mon, 10 Oct 2016 11:39:08 +0300
Subject: [PATCH 18/19] Add Antonio De Marinis to maintainers

---
 library/plone | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/plone b/library/plone
index 2506dbe071e7c..cd66ba49b3307 100644
--- a/library/plone
+++ b/library/plone
@@ -1,5 +1,6 @@
 Maintainers: Alin Voinea <alin.voinea@gmail.com> (@avoinea),
-             Sven Strack <sven@so36.net> (@svx)
+             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.0.6, 5.0, 5, latest

From 278d4f0bc06e9c1f1b7622d09982652163638c74 Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin.voinea@gmail.com>
Date: Wed, 12 Oct 2016 00:14:04 +0300
Subject: [PATCH 19/19] Cleanup plone-addons test

---
 test/tests/plone-addons/run.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/tests/plone-addons/run.sh b/test/tests/plone-addons/run.sh
index b0cd4d28fa45f..054f865e02e10 100755
--- a/test/tests/plone-addons/run.sh
+++ b/test/tests/plone-addons/run.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 set -eo pipefail
 
-image="$1"
-
-cname="plone-container-$RANDOM-$RANDOM"
-cid="$(docker run -d -e PLONE_DEVELOP=src/eea.facetednavigation -e PLONE_ADDONS=eea.facetednavigation -e PLONE_ZCML=eea.facetednavigation-meta --name "$cname" "$image" cat)"
-trap "docker rm -vf $cid > /dev/null" EXIT
-
-docker exec "$cname" cat custom.cfg
+docker run -i --rm \
+	-e PLONE_DEVELOP=src/eea.facetednavigation \
+	-e PLONE_ADDONS=eea.facetednavigation \
+	-e PLONE_ZCML=eea.facetednavigation-meta \
+	-v /plone/instance/bin/develop \
+	"$1" cat custom.cfg