diff --git a/Dockerfile b/Dockerfile index e7411a2..1eaccd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM plone/plone-backend:6.0.11.1 as base +FROM plone/plone-backend:6.0.13 as base FROM base as builder -ENV PLONE_VERSION=6.0.11.1 \ +ENV PLONE_VERSION=6.0.13 \ GRAYLOG=logcentral.eea.europa.eu:12201 \ GRAYLOG_FACILITY=plone-backend \ MEMCACHE_SERVER=memcached:11211 \ @@ -20,7 +20,7 @@ RUN pip wheel -r requirements.txt -c constraints.txt -c https://dist.plone.org/r FROM base -ENV PLONE_VERSION=6.0.11.1 \ +ENV PLONE_VERSION=6.0.13 \ GRAYLOG=logcentral.eea.europa.eu:12201 \ GRAYLOG_FACILITY=plone-backend \ MEMCACHE_SERVER=memcached:11211 \ @@ -36,12 +36,8 @@ RUN ./bin/pip install --no-index --no-deps /wheelhouse/* \ && find /app -not -user plone -exec chown plone:plone {} \+ # Custom versions, to be removed after Plone version upgrade -# https://taskman.eionet.europa.eu/issues/272819 # https://taskman.eionet.europa.eu/issues/277938 -# https://taskman.eionet.europa.eu/issues/278170 -RUN ./bin/pip install plone.namedfile==6.3.1 \ - && ./bin/pip install Products.CMFCore==3.6 \ - && ./bin/pip install plone.volto==4.4.3 +RUN ./bin/pip install Products.CMFCore==3.6 ENTRYPOINT [ "/app/docker-entrypoint.sh" ] CMD ["start"] diff --git a/constraints.txt b/constraints.txt index 4d11292..ac05990 100644 --- a/constraints.txt +++ b/constraints.txt @@ -28,24 +28,26 @@ eea.api.glossary==1.2 # Picked versions amqp==5.2.0 amqplib==1.0.2 -Authomatic==1.2.1 +Authomatic==1.3.0 bda.cache==1.3.0 -dnspython==2.6.1 -elastic-transport==8.13.0 -elasticsearch==8.13.1 -eventlet==0.36.1 +dnspython==2.7.0 +elastic-transport==8.15.0 +elasticsearch==8.15.1 +eventlet==0.37.0 five.globalrequest==99.1 graypy==3.2.0 -greenlet==3.0.3 +greenlet==3.1.1 hurry.filesize==0.9 -ijson==3.2.3 +ijson==3.3.0 node.ext.ldap==1.2 node.ext.ugm==1.1 -node==1.2.1 +node==1.2.2 odict==1.9.0 passlib==1.7.4 plone.synchronize==1.0.4 plumber==1.7 +pyasn1-modules==0.4.1 +pyasn1==0.6.1 PyYAML==6.0.1 sentry-sdk==1.45.0 vine==5.1.0 diff --git a/develop/Makefile b/develop/Makefile index e8ee170..cb28f4b 100644 --- a/develop/Makefile +++ b/develop/Makefile @@ -42,7 +42,7 @@ endif ############################################################################## # SETTINGS AND VARIABLE -PLONE_VERSION=6.0.11.1 +PLONE_VERSION=6.0.13 #`docker run -i --rm eeacms/plone-backend env | grep PLONE_VERSION | sed "s/PLONE_VERSION=//g"` PYTHON?=python3.11