Refactored buildout files

Author: sgeulette

Dockerfile

@@ -41,7 +41,7 @@ COPY --chown=imio scripts /plone/scripts
 RUN mkdir /plone/bin && chown imio:imio /plone/bin
 RUN ln -s /usr/bin/pip3 /plone/bin/pip
 
-RUN su -c "buildout -c prod.cfg -t 30 -N" -s /bin/sh imio
+RUN su -c "buildout -c docker.cfg -t 30 -N" -s /bin/sh imio
 
 
 FROM harbor.imio.be/common/plone-base:6.1.1

Makefile

@@ -29,8 +29,8 @@ buildout:  ## Runs setup and buildout
 	# if ! test -d /srv/cache/download/dist; then mkdir /srv/cache/download/dist || true; fi
 	# if ! test -f /srv/cache/download/dist/appy-1.0.15.tar.gz; then scp -o 'StrictHostKeyChecking no' docs001:/srv/cache/download/dist/appy-1.0.15.tar.gz /srv/cache/download/dist/ || true; fi
 	# if ! test -f var/filestorage/Data.fs;then make standard-config; else bin/buildout -v;fi
-	bin/buildout -v
-	git checkout .gitignore
+	bin/buildout
+# 	git checkout .gitignore
 
 .PHONY: copy
 copy: copy-data.sh  ## Runs `copy-data.sh`

base.cfg

@@ -5,10 +5,9 @@ extensions =
 show-picked-versions = true
 allow-picked-versions = false
 
-
 parts =
-    dists-download
-    dists-egg
+;    dists-download
+;    dists-egg
     omelette
     instance1
     zopepy
@@ -18,7 +17,7 @@ extends =
     https://dist.plone.org/release/6.1.1/versions.cfg
     https://raw.github.com/plone/buildout.dexterity/master/sources.cfg
     versions-base.cfg
-    sources-base.cfg
+;    sources-base.cfg
 
 versions=versions
 
@@ -37,19 +36,20 @@ develop =
 
 always-checkout = force
 auto-checkout +=
-    collective.contact.importexport
-    collective.externaleditor
-    collective.portlet.actions
-    collective.z3cform.select2
-    eea.facetednavigation
-    imio.dms.mail
-    imio.transmogrifier.contact
-    imio.transmogrifier.iadocs
-    plone.formwidget.datetime
-    Products.CMFEditions
-    Products.CPUtils
-    transmogrify.dexterity
-    zope.sendmail
+;    collective.contact.importexport
+;    collective.externaleditor
+;    collective.portlet.actions
+;    collective.relationhelpers
+;    collective.z3cform.select2
+;    eea.facetednavigation
+;    imio.dms.mail
+;    imio.transmogrifier.contact
+;    imio.transmogrifier.iadocs
+;    plone.formwidget.datetime
+;    Products.CMFEditions
+;    Products.CPUtils
+;    transmogrify.dexterity
+;    zope.sendmail
 
 [dists-download]
 recipe = collective.recipe.cmd
@@ -78,7 +78,9 @@ http-address = ${port:instance1-http}
 zserver-threads = 4
 debug-mode = off
 verbose-security = off
+zodb-temporary-storage = off
 zope-conf-additional =
+;  extensions ${buildout:directory}/Extensions
   %define FILESTORAGE ${buildout:directory}/var/filestorage
   %define BLOBSTORAGE ${buildout:directory}/var/blobstorage
   %include ${buildout:directory}/zope_add.conf
@@ -98,22 +100,22 @@ environment-vars =
 
 eggs =
   ${buildout:eggs}
-  collective.upgrade
+;  collective.upgrade
 #  imio.dms.policy
 #  Products.PrintingMailHost
 
 zcml =
 #  imio.dms.policy
-  imio.pm.wsclient
-  imio.pm.locales
+;  imio.pm.wsclient
+;  imio.pm.locales
 
 products =
 
 [upgrade]
 recipe = zc.recipe.egg
 eggs =
     ${instance1:eggs}
-    ${debug:eggs}
+;    ${debug:eggs}
 scripts = upgrade-portals
 arguments = args=[
     '--zope-conf', '${instance1:location}/etc/zope.conf',
@@ -144,7 +146,7 @@ post-extras = standard-config.py
 eggs =
     ipdb
     iw.debug
-    profilehooks
+;    profilehooks
 zcml =
     iw.debug
 

buildout-main.cfg

@@ -3,7 +3,7 @@
 extends =
     base.cfg
     port.cfg
-    amqp.cfg
+#    amqp.cfg
 #    prod.cfg
     sources.cfg
     dev.cfg

dev.cfg

@@ -6,83 +6,83 @@ allow-picked-versions = true
 
 parts +=
     instance-amqp
-    upgrade
+;    upgrade
     cmds
 
 always-checkout = force
 auto-checkout +=
-    Products.CPUtils
-    Products.PasswordStrength
-    appy
-    collective.behavior.internalnumber
-    collective.behavior.talcondition
-    collective.classification.folder
-    collective.classification.tree
-    collective.compoundcriterion
-    collective.contact.core
-    collective.contact.contactlist
-    collective.contact.duplicated
-    collective.contact.facetednav
-    collective.contact.plonegroup
-    collective.contact.widget
-    collective.dms.basecontent
-    collective.dms.batchimport
-    collective.dms.mailcontent
-    collective.dms.scanbehavior
-#    collective.dms.thesaurus
-    collective.documentgenerator
-#    collective.documentviewer
-    collective.eeafaceted.batchactions
-    collective.eeafaceted.collectionwidget
-    collective.eeafaceted.dashboard
-    collective.eeafaceted.z3ctable
-    collective.excelexport
-    collective.externaleditor
-    collective.iconifiedcategory
-    collective.ckeditor
-#    collective.ckeditortemplates
-    collective.js.datatables
-    collective.js.tooltipster
-#    collective.local.workspace
-    collective.messagesviewlet
-    collective.querynextprev
-    collective.schedulefield
-    collective.task
-    collective.wfadaptations
-    collective.z3cform.select2
-    collective.zamqp
-    communesplone.layout
-    dexterity.localroles
-    dexterity.localrolesfield
-#    eea.facetednavigation
-#    eea.faceted.vocabularies
-    ftw.labels
-    imio.actionspanel
-    imio.annex
-    imio.dashboard
-    imio.dataexchange.core
-    imio.dms.policy
-    imio.dms.soap2pm
-    imio.fpaudit
-    imio.helpers
-    imio.history
-    imio.migrator
-    imio.pm.locales
-    imio.pm.wsclient
-    imio.prettylink
-    imio.pyutils
-#    imio.restapi
-    imio.zamqp.core
-    imio.zamqp.dms
-#    plone.app.jquerytools
-    plone.app.robotframework
-#    plone.app.workflowmanager
-#    plone.dexterity
-#    plone.restapi
-    plonetheme.imioapps
+;    Products.CPUtils
+;    Products.PasswordStrength
+;    appy
+;    collective.behavior.internalnumber
+;    collective.behavior.talcondition
+;    collective.classification.folder
+;    collective.classification.tree
+;    collective.compoundcriterion
+;    collective.contact.core
+;    collective.contact.contactlist
+;    collective.contact.duplicated
+;    collective.contact.facetednav
+;    collective.contact.plonegroup
+;    collective.contact.widget
+;    collective.dms.basecontent
+;    collective.dms.batchimport
+;    collective.dms.mailcontent
+;    collective.dms.scanbehavior
+;#    collective.dms.thesaurus
+;    collective.documentgenerator
+;#    collective.documentviewer
+;    collective.eeafaceted.batchactions
+;    collective.eeafaceted.collectionwidget
+;    collective.eeafaceted.dashboard
+;    collective.eeafaceted.z3ctable
+;    collective.excelexport
+;    collective.externaleditor
+;    collective.iconifiedcategory
+;    collective.ckeditor
+;#    collective.ckeditortemplates
+;    collective.js.datatables
+;    collective.js.tooltipster
+;#    collective.local.workspace
+;    collective.messagesviewlet
+;    collective.querynextprev
+;    collective.schedulefield
+;    collective.task
+;    collective.wfadaptations
+;    collective.z3cform.select2
+;    collective.zamqp
+;    communesplone.layout
+;    dexterity.localroles
+;    dexterity.localrolesfield
+;#    eea.facetednavigation
+;#    eea.faceted.vocabularies
+;    ftw.labels
+;    imio.actionspanel
+;    imio.annex
+;    imio.dashboard
+;    imio.dataexchange.core
+;    imio.dms.policy
+;    imio.dms.soap2pm
+;    imio.fpaudit
+;    imio.helpers
+;    imio.history
+;    imio.migrator
+;    imio.pm.locales
+;    imio.pm.wsclient
+;    imio.prettylink
+;    imio.pyutils
+;#    imio.restapi
+;    imio.zamqp.core
+;    imio.zamqp.dms
+;#    plone.app.jquerytools
+;    plone.app.robotframework
+;#    plone.app.workflowmanager
+;#    plone.dexterity
+;#    plone.restapi
+;    plonetheme.imioapps
 
 [instance1]
-initialization = import shutup; shutup.please()
+;initialization = import shutup; shutup.please()
 #use the instance1 eggs to extends the base eggs defined in [buildout]
 #webdav-address=1980
 debug-mode = on
@@ -93,20 +93,20 @@ environment-vars +=
 #    Z3C_AUTOINCLUDE_DEBUG True
 
 eggs +=
-    ${debug:eggs}
-    shutup
+;    ${debug:eggs}
+;    shutup
 #    Products.PDBDebugMode
-    Products.PrintingMailHost
-    collective.wfautodoc
+;    Products.PrintingMailHost
+;    collective.wfautodoc
 #    imio.restapi
-    plone.app.workflowmanager
+;    plone.app.workflowmanager
 #    wildcard.fixpersistentutilities
 
 zcml +=
-    ${debug:zcml}
+;    ${debug:zcml}
 
 zope-conf-additional +=
-  ${zope-conf:zamqp}
+;  ${zope-conf:zamqp}
 #   <clock-server>
 #       method /${port:plone-path}/@@cron-tick
 #       period 3600
@@ -123,18 +123,19 @@ cmds =
 #    cd ${buildout:directory}/src/collective.contact.widget; git checkout contactlist-filtering; git pull;
 #    cd ${buildout:directory}/src/imio.dms.mail; git checkout count_todos; git pull;
 
-[instance-amqp]
-<= instance1
-zserver-threads = 1
-eggs =
-    ${instance1:eggs}
-    imio.zamqp.dms
-zcml =
-    ${instance1:zcml}
-    imio.zamqp.dms
-http-address = ${port:instance-amqp-http}
-zope-conf-additional =
-  %define FILESTORAGE ${buildout:directory}/var/filestorage
-  %define BLOBSTORAGE ${buildout:directory}/var/blobstorage
-  ${zope-conf:zamqp}
-  ${zope-conf:amqp}
+;[instance-amqp]
+;<= instance1
+;zserver-threads = 1
+;eggs =
+;    ${instance1:eggs}
+;    imio.zamqp.dms
+;zcml =
+;    ${instance1:zcml}
+;    imio.zamqp.dms
+;http-address = ${port:instance-amqp-http}
+;zope-conf-additional =
+;;  publisher-profile-file ${buildout:directory}/profile.dat
+;  %define FILESTORAGE ${buildout:directory}/var/filestorage
+;  %define BLOBSTORAGE ${buildout:directory}/var/blobstorage
+;;  ${zope-conf:zamqp}
+;;  ${zope-conf:amqp}

docker.cfg

@@ -0,0 +1,8 @@
+[buildout]
+# Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
+extends =
+    base.cfg
+    port.cfg
+#    amqp.cfg
+    prod.cfg
+    sources-prod.cfg