Remove instance-cron for docker deployments

IMIO · Dec 19, 2023 · 685f71a · 685f71a
1 parent d213056
commit 685f71a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/docker-dev.cfg b/docker-dev.cfg
@@ -1,7 +1,6 @@
 [buildout]
 parts +=
     instance
-    instance-cron
 parts -=
     instance2
     instance3
@@ -23,6 +22,12 @@ zope-conf-additional =
        bind 0.0.0.0:${port:instance1-monitor}
     </product-config>
     ${zope-conf:additional}
+    <clock-server>
+      method /${port:plone-path}/@@cron-tick
+      period 3600
+      user admin
+      password ${port:admin-password}
+    </clock-server>
     ${zope-conf:zamqp}
 environment-vars -=
     OO_PORT ${port:oo-port}
@@ -38,19 +43,6 @@ blob-storage = /data/blobstorage
 environment-vars =
     ZC_ASYNC_UUID /data/async-uuid.txt
 
-[instance-cron]
-<= instance
-http-address = 8087
-zope-conf-additional =
-  ${zope-conf:additional}
-  <clock-server>
-      method /${port:plone-path}/@@cron-tick
-      period 3600
-      user admin
-      password ${port:admin-password}
-  </clock-server>
-  ${zope-conf:zamqp}
-
 environment-vars += ${bigbang:environment-vars}
 
 [instance-debug]

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -61,7 +61,7 @@ function start() {
 
 setup "$1"
 
-#PRIORIY="instance-cron instance-debug maintenance script zeoserver"
+#PRIORIY=instance-cron instance-debug maintenance script zeoserver"
 #if [[ "instance" == "$1" || ( ! $PRIORIY == *"$1"* && $# -gt 0 ) ]]; then
 #  wait_for_cron "$1"
 #fi

diff --git a/docker/docker-initialize.py b/docker/docker-initialize.py
@@ -28,7 +28,6 @@ def __init__(
         self.instance1_conf = '/plone/parts/instance/etc/zope.conf'
         self.instance_amqp_conf = '/plone/parts/instance-amqp/etc/zope.conf'
         self.instance_async_conf = '/plone/parts/instance-async/etc/zope.conf'
-        self.instance_cron_conf = '/plone/parts/instance-cron/etc/zope.conf'
         self.instance_debug_conf = '/plone/parts/instance-debug/etc/zope.conf'
         self.zeoserver_conf = '/plone/parts/zeoserver/etc/zeo.conf'
 
@@ -84,10 +83,9 @@ def _fix_amqp(self, path):
     def fixtures(self):
         """ ZEO Client
         """
-        self._fix_conf(self.instance1_conf, False)
+        self._fix_conf(self.instance1_conf, True)
         self._fix_conf(self.instance_async_conf, False)
         self._fix_conf(self.instance_amqp_conf, False)
-        self._fix_conf(self.instance_cron_conf, True)
         # instance debug doesn't exist in dev env
         if os.path.exists(self.instance_debug_conf):
             self._fix_conf(self.instance_debug_conf, False)