Skip to content

Commit

Permalink
Update Plone (to 6.0.14) and requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
boulch committed Jan 27, 2025
1 parent 50b3da2 commit aded695
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
1.3.16 (unreleased)
-------------------

- Migrate to Plone 6.0.14
[boulch]

- imio.smartweb.core 1.2.82

- WEB-4153 : Add language cookie to python requests to avoid cache problems
Expand Down
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM harbor.imio.be/common/plone-base:6.0.9-ubuntu as builder

LABEL maintainer="Benoît Suttor <benoit.suttor@imio.be>"
ENV PIP=23.3.1 \
ZC_BUILDOUT=3.0.1 \
SETUPTOOLS=69.0.2 \
WHEEL=0.42.0 \
ENV PIP=24.3.1 \
ZC_BUILDOUT=3.3 \
SETUPTOOLS=75.6.0 \
WHEEL=0.45.1 \
PLONE_MAJOR=6.0 \
PLONE_VERSION=6.0.9
PLONE_VERSION=6.0.14

# hadolint ignore=DL3008
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -44,12 +44,12 @@ RUN su -c "buildout -c prod.cfg -t 30 -N" -s /bin/sh imio
# RUN for egg in `ls /plone/eggs/ | cut -d '-' -f 1 | uniq`; do rm -rfv `ls -td /plone/eggs/$egg-* | awk 'NR>1'`; done

FROM harbor.imio.be/common/plone-base:6.0.9-ubuntu
ENV PIP=23.3.1 \
ZC_BUILDOUT=3.0.1 \
SETUPTOOLS=69.0.2 \
WHEEL=0.42.0 \
ENV PIP=24.3.1 \
ZC_BUILDOUT=3.3 \
SETUPTOOLS=75.6.0 \
WHEEL=0.45.1 \
PLONE_MAJOR=6.0 \
PLONE_VERSION=6.0.9 \
PLONE_VERSION=6.0.14 \
HOSTNAME_HOST=local \
PROJECT_ID=smartweb \
PLONE_EXTENSION_IDS=plone.app.caching:default,plonetheme.barceloneta:default,imio.smartweb.policy:default \
Expand Down
6 changes: 3 additions & 3 deletions base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ extensions =
mr.developer

extends =
https://dist.plone.org/release/6.0.9/versions.cfg
https://dist.plone.org/release/6.0.9/versions-ecosystem.cfg
https://dist.plone.org/release/6.0.9/versions-extra.cfg
https://dist.plone.org/release/6.0.14/versions.cfg
https://dist.plone.org/release/6.0.14/versions-ecosystem.cfg
https://dist.plone.org/release/6.0.14/versions-extra.cfg
versions.cfg

find-links +=
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r https://dist.plone.org/release/6.0.9/requirements.txt
-r https://dist.plone.org/release/6.0.14/requirements.txt

0 comments on commit aded695

Please sign in to comment.