From 27f2e666a4b4f199d708ebda41c149036c1febc7 Mon Sep 17 00:00:00 2001
From: Giles Knap <gilesknap@gmail.com>
Date: Sat, 6 Jan 2024 21:22:23 +0000
Subject: [PATCH] REALLY make the container python 3.12

---
 .devcontainer/Dockerfile     | 8 +-------
 .devcontainer/local_build.sh | 2 +-
 .github/workflows/code.yml   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7c17f271..21527576 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -4,7 +4,7 @@
 # container. The devcontainer should be rootful and use podman or docker
 # with user namespaces.
 
-ARG BASE="mcr.microsoft.com/vscode/devcontainers/python:0-3.10-bullseye"
+ARG BASE="mcr.microsoft.com/devcontainers/python:dev-3.12-bullseye"
 FROM ${BASE} as base
 
 # use root to pin where the packages will install
@@ -13,12 +13,6 @@ ENV PATH=/root/.local/bin:$PATH
 
 FROM base as developer
 
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    gcc python3-dev && \
-    rm -rf /var/lib/apt/lists/*
-
 WORKDIR /workspace
 COPY . .
 
diff --git a/.devcontainer/local_build.sh b/.devcontainer/local_build.sh
index 106fec34..58482fca 100755
--- a/.devcontainer/local_build.sh
+++ b/.devcontainer/local_build.sh
@@ -18,5 +18,5 @@ echo building $container_name ...
 # run the build with required build-args for a runtime build
 cd ${THIS_DIR}
 ln -s ../dist .
-docker build --build-arg BASE=python:3.10-slim -t $container_name .. --file ./Dockerfile
+docker build --build-arg BASE=python:3.12-slim -t $container_name .. --file ./Dockerfile
 unlink dist
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
index e0dac4b9..5b25fd94 100644
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -209,7 +209,7 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           push: true
-          build-args: BASE=python:3.10-slim
+          build-args: BASE=python:3.12-slim
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache