Merge branch 'main' into docker_parallel

psf · Nov 19, 2023 · 9688ca3 · 9688ca3
2 parents b4dbc4a + 96faa3b
commit 9688ca3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -45,6 +45,7 @@
 
 - Enable 3.12 CI (#4035)
 - Build docker images in parallel (#4054)
+- Build docker images with 3.12 (#4055)
 
 ### Documentation
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-slim AS builder
+FROM python:3.12-slim AS builder
 
 RUN mkdir /src
 COPY . /src/
@@ -12,7 +12,7 @@ RUN . /opt/venv/bin/activate && pip install --no-cache-dir --upgrade pip setupto
     && cd /src && hatch build -t wheel \
     && pip install --no-cache-dir dist/*-cp*[colorama,d,uvloop]
 
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 # copy only Python packages to limit the image size
 COPY --from=builder /opt/venv /opt/venv