From 1f5954be5e958510ed1c3486ecb4e6952843c38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Dubois?= <remi.dubois@gmail.com>
Date: Mon, 27 Jan 2025 13:43:33 +0100
Subject: [PATCH] fix: plone base image

WEB-4204
---
 CHANGES.rst  | 7 ++++---
 Dockerfile   | 7 ++++---
 Makefile     | 8 ++++----
 versions.cfg | 4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index afbf4e7..ded5d67 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,9 @@
 1.3.16 (unreleased)
 -------------------
 
-- Migrate to Plone 6.0.14
-  [boulch]
+
+- Migrate to Python 3.12, Plone 6.0.14
+  [boulch, remdub]
 
 - imio.smartweb.core 1.2.82
 
@@ -53,7 +54,7 @@
 -------------------
 
 - imio.smartweb.core 1.2.76
-  
+
     - WEB-4199 : Fix missing contacts when there are more contacts than default Plone batching
       [boulch]
 
diff --git a/Dockerfile b/Dockerfile
index 250bfa3..fb01370 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM harbor.imio.be/common/plone-base:6.0.9-ubuntu as builder
+FROM harbor.imio.be/common/plone-base:6.0.14 as builder
 
 LABEL maintainer="Benoît Suttor <benoit.suttor@imio.be>"
 ENV PIP=24.3.1 \
@@ -43,7 +43,8 @@ RUN su -c "buildout -c prod.cfg -t 30 -N" -s /bin/sh imio
 # clean up old eggs
 # 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
+
+FROM harbor.imio.be/common/plone-base:6.0.14
 ENV PIP=24.3.1 \
   ZC_BUILDOUT=3.3 \
   SETUPTOOLS=75.6.0 \
@@ -79,7 +80,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN curl -L https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb > /tmp/dumb-init.deb && dpkg -i /tmp/dumb-init.deb && rm /tmp/dumb-init.deb
 COPY --from=builder /usr/local/bin/py-spy /usr/local/bin/py-spy
 COPY --chown=imio --from=builder /plone .
-COPY --from=builder /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
+COPY --from=builder /usr/local/lib/python3.12/dist-packages /usr/local/lib/python3.12/dist-packages
 COPY --chown=imio docker-initialize.py docker-entrypoint.sh /
 
 USER imio
diff --git a/Makefile b/Makefile
index 4334a1f..95093bc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ buildout.cfg:
 	ln -fs dev.cfg buildout.cfg
 
 bin/buildout: bin/pip buildout.cfg
-	bin/pip install -I -r requirements.txt
+	bin/uv pip install -r requirements.txt
 
 buildout: bin/instance
 
@@ -16,8 +16,8 @@ bin/instance: bin/buildout
 	bin/buildout
 
 bin/pip:
-	python3.10 -m venv .
-	bin/pip install setuptools==69.0.2
+	python3.12 -m venv .
+	bin/pip install uv
 
 run: bin/instance
 	bin/instance fg
@@ -42,7 +42,7 @@ test-image: bin/pip
 	#make local-test-image
 
 local-test-image:
-	python3 -m venv .
+	python3.12 -m venv .
 	./bin/pip install -r tests/requirements.txt
 	./bin/pytest -s tests
 
diff --git a/versions.cfg b/versions.cfg
index 9ecc5fe..3f66063 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -5,7 +5,7 @@ imio.smartweb.core = 1.2.82
 imio.smartweb.policy = 1.2.6
 imio.smartweb.locales = 1.1.21
 
-Authomatic = 1.0.0
+Authomatic = 1.3.0
 backcall = 0.2.0
 collective.anysurfer = 1.4.7
 collective.autopublishing = 1.1b1
@@ -44,7 +44,7 @@ jwcrypto = 1.5.0
 matplotlib-inline = 0.1.6
 more_itertools = 9.1.0
 parso = 0.8.3
-pas.plugins.authomatic = 1.1.1
+pas.plugins.authomatic = 1.4.0
 pas.plugins.imio = 2.0.9
 perfmetrics = 3.3.0
 pexpect = 4.8.0