From 935b52ed99473f449497cf426cf9a27ba5c19c5e Mon Sep 17 00:00:00 2001
From: Andri Joos <andri@joos.io>
Date: Tue, 3 Dec 2024 21:44:54 +0100
Subject: [PATCH] add multi version image
---
.gitlab-ci.yml | 16 +++++++++++++---
Dockerfile | 7 ++++++-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acab03a..247d1ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,18 @@ include:
ref: master
file: devcontainer_images.gitlab-ci.yml
-build:
+variables:
+ IMAGE_BASENAME: ${IMAGE_PREFIX}/devcontainer-python
+ TAG_SUFFIX: bookworm
+
+"3.13.0":
extends: .build_image_job_template
variables:
- IMAGE_BASENAME: ${IMAGE_PREFIX}/devcontainer-python
- IMAGE_NAME: ${IMAGE_BASENAME}:3.13.0-bookworm,${IMAGE_BASENAME}:3.13-bookworm,${IMAGE_BASENAME}:3-bookworm
+ IMAGE_NAME: ${IMAGE_BASENAME}:3.13.0-${TAG_SUFFIX},${IMAGE_BASENAME}:3.13-${TAG_SUFFIX},${IMAGE_BASENAME}:3-${TAG_SUFFIX}
+ BUILD_ARGS: BASE_IMAGE_VERSION=3.13.0
+
+"3.12.7":
+ extends: .build_old_version
+ variables:
+ IMAGE_NAME: ${IMAGE_BASENAME}:3.12.7-${TAG_SUFFIX},${IMAGE_BASENAME}:3.12-${TAG_SUFFIX}
+ BUILD_ARGS: BASE_IMAGE_VERSION=3.12.7
diff --git a/Dockerfile b/Dockerfile
index a744085..a2a15e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3.13.0-bookworm
+ARG BASE_IMAGE_VERSION="3.12.7"
+
+FROM python:$BASE_IMAGE_VERSION-bookworm
ARG USERNAME="vscode"
ARG USER_UID="1000"
@@ -10,4 +12,7 @@ RUN groupadd --gid ${USER_GID} ${USERNAME} \
&& mkdir -p ${WORKSPACE}
USER $USERNAME
+
+RUN python -m pip install --upgrade pip
+
WORKDIR ${WORKSPACE}
--
GitLab