Plone: Fix zeo shared blob env

[avoinea]

Refs plone/plone.docker#167

[tianon]

Just to be clear, this change is needed for those two older tags too? (Looking at #11795, it appears you're up to three concurrent versions only temporarily? 😅)

Also, that CI failure is a little weird -- it appears there's some extra unexpected whitespace in the output? Do you think that's just a fluke that we should restart for, or something the test needs to be updated for?

[avoinea]

Just to be clear, this change is needed for those two older tags too? (Looking at #11795, it appears you're up to three concurrent versions only temporarily? sweat_smile)

True, we can skip the older tags.

Also, that CI failure is a little weird -- it appears there's some extra unexpected whitespace in the output? Do you think that's just a fluke that we should restart for, or something the test needs to be updated for?

It seems to be a thing. I'll look into it 😉

[tianon]

It's probably been a minute since we shared our standard "copypasta" about older tags with you, so just for reference/reminder:

Removing tags here will remove them from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding them on the official build servers), but the tags will still be available to users who want them. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.)

👍

[tianon]

Hopefully https://www.githubstatus.com/incidents/fpk08rxnqjz2 is resolved soon 🙈

[tianon]

(Rebased to trigger GitHub Actions 👍)

[github-actions]

Diff for adceb4b:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index b7cba93..8186f16 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,14 +1,6 @@
 Maintainers: Alin Voinea <alin.voinea@gmail.com> (@avoinea), Piero Nicolli <piero.nicolli@redturtle.it> (@pnicolli), 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.5-python38, 5.2.5
-GitCommit: a93b111b144ee7db61b7567926dfa3cee51d0960
-Directory: 5.2/5.2.5/debian
-
-Tags: 5.2.6-python38, 5.2.6
-GitCommit: a93b111b144ee7db61b7567926dfa3cee51d0960
-Directory: 5.2/5.2.6/debian
-
 Tags: 5.2.7-python38, 5.2-python38, 5-python38, python38, 5.2.7, 5.2, 5, latest
-GitCommit: a93b111b144ee7db61b7567926dfa3cee51d0960
+GitCommit: d17783d696042a3e9c2214c289306493e75f5ddc
 Directory: 5.2/5.2.7/debian
diff --git a/_bashbrew-list b/_bashbrew-list
index 500a279..beab2f6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,10 +2,6 @@ plone:5
 plone:5-python38
 plone:5.2
 plone:5.2-python38
-plone:5.2.5
-plone:5.2.5-python38
-plone:5.2.6
-plone:5.2.6-python38
 plone:5.2.7
 plone:5.2.7-python38
 plone:latest
diff --git a/plone_5.2.5/Dockerfile b/plone_5.2.5/Dockerfile
deleted file mode 100644
index 0efc52d..0000000
diff --git a/plone_5.2.5/buildout.cfg b/plone_5.2.5/buildout.cfg
deleted file mode 100644
index 8b4cae5..0000000
diff --git a/plone_5.2.5/docker-entrypoint.sh b/plone_5.2.5/docker-entrypoint.sh
deleted file mode 100755
index ecf7f76..0000000
diff --git a/plone_5.2.5/docker-initialize.py b/plone_5.2.5/docker-initialize.py
deleted file mode 100755
index f241c84..0000000
diff --git a/plone_5.2.6/Dockerfile b/plone_5.2.6/Dockerfile
deleted file mode 100644
index 62143b9..0000000
diff --git a/plone_5.2.6/buildout.cfg b/plone_5.2.6/buildout.cfg
deleted file mode 100644
index ce997be..0000000
diff --git a/plone_5.2.6/docker-entrypoint.sh b/plone_5.2.6/docker-entrypoint.sh
deleted file mode 100755
index ecf7f76..0000000
diff --git a/plone_5.2.6/docker-initialize.py b/plone_5.2.6/docker-initialize.py
deleted file mode 100755
index f241c84..0000000
diff --git a/plone_latest/docker-initialize.py b/plone_latest/docker-initialize.py
index f241c84..cfbf6d2 100755
--- a/plone_latest/docker-initialize.py
+++ b/plone_latest/docker-initialize.py
@@ -263,8 +263,11 @@ class Environment(object):
         # If we need to create a plonesite and we have a zeo setup
         # configure collective.recipe.plonesite properly
         server = self.env.get("ZEO_ADDRESS", None)
+        shared_blob_dir=self.env.get("ZEO_SHARED_BLOB_DIR", "off")
+
         if server:
-            buildout += ZEO_INSTANCE_TEMPLATE.format(zeoaddress=server)
+            buildout += ZEO_INSTANCE_TEMPLATE.format(zeoaddress=server,
+                                                     shared_blob_dir=shared_blob_dir)
 
         # Add RelStorage configuration if needed
         if relstorage:
@@ -343,7 +346,7 @@ ZEO_INSTANCE_TEMPLATE = """
 [instance]
 zeo-client = true
 zeo-address = {zeoaddress}
-shared-blob = off
+shared-blob = {shared_blob_dir}
 http-fast-listen = off
 """

Relevant Maintainers:

• plone: @avoinea @pnicolli @svx @demarant