chore: refactored build

Dockerfile

@@ -1,20 +1,15 @@
-FROM eeacms/plone:5.2.9-32
+FROM eeacms/plone:5.2.13-22
 
 ENV GRAYLOG_FACILITY=wise-plone
 
+COPY site.cfg /plone/instance/
 RUN buildDeps="build-essential libldap2-dev libsasl2-dev libssl-dev git vim xz-utils curl" \
-               && apt-get update \ 
-               && apt-get install -y --no-install-recommends $buildDeps 
-
-RUN mv /plone/instance/versions.cfg /plone/instance/eea-versions.cfg
-
-COPY src/docker/* /
-COPY src/plone/* /plone/instance/
-
-RUN curl "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb" -L -o "wkhtmltopdf.deb"
-RUN ar x wkhtmltopdf.deb
-RUN tar Jxvf data.tar.xz
-RUN mkdir /plone/instance/parts/wkhtmltopdf
-RUN mv usr/local/bin/wkhtmltopdf /plone/instance/parts/wkhtmltopdf/wkhtmltopdf
-
-RUN /docker-setup.sh
+    && apt-get update \
+    && apt-get install -y --no-install-recommends $buildDeps \
+    && curl "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb" -L -o "wkhtmltopdf.deb" \
+    && ar x wkhtmltopdf.deb \
+    && tar Jxvf data.tar.xz \
+    && mkdir /plone/instance/parts/wkhtmltopdf \
+    && mv usr/local/bin/wkhtmltopdf /plone/instance/parts/wkhtmltopdf/wkhtmltopdf \
+    && find /plone -not -user plone -exec chown plone:plone {} \+ \
+    && gosu plone buildout -c site.cfg

Jenkinsfile

@@ -2,6 +2,7 @@ pipeline {
   environment {
     registry = 'eeacms/marine-backend'
     template = 'templates/marine-backend'
+    GIT_NAME = 'marine-backend'
   }
 
   agent any

devel/Dockerfile

@@ -1,4 +1,6 @@
-FROM eeacms/plonesaas:5.2.4-68
+FROM eeacms/marine-backend
+
+COPY devel.cfg /plone/instance/
 
 COPY docker-setup.sh /
 RUN /docker-setup.sh

devel/devel.cfg

@@ -0,0 +1,16 @@
+[configuration]
+eggs +=
+    collective.MockMailHost
+
+[buildout]
+extends = develop.cfg
+
+parts +=
+    test
+
+[test]
+recipe = collective.xmltestreport
+defaults = ['--auto-color', '--auto-progress', '--ignore_dir=.git', '--ignore_dir=bower_components', '--ignore_dir=node_modules', '--ignore_dir=src']
+eggs =
+  ${configuration:eggs}
+  ${configuration:test-packages}

src/plone/site.cfg → site.cfg

@@ -72,8 +72,10 @@ wise.msfd = git https://github.com/eea/wise.msfd.git branch=plone5
 eea.privacyscreen = git https://github.com/eea/eea.privacyscreen.git branch=master
 
 [versions]
+eea.api.dataconnector = 9.0
 plone.rest = 2.0.0a5
 collective.z3cform.datagridfield = 1.5.3
+rdflib-jsonld = 0.6.2
 SQLAlchemy = 1.4.46
 # START collective.exportimport
 collective.exportimport = 1.7