removing lean39 from matrix

apache · Jan 23, 2024 · 49a6f9b · 49a6f9b
1 parent 5dff290
commit 49a6f9b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: ["dev", "lean", "lean310", "lean39", "websocket", "dockerize"]
+        target: ["dev", "lean", "lean310", "websocket", "dockerize"]
         platform: ["linux/amd64", "linux/arm64"]
       fail-fast: false
     steps:

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: ["dev", "lean", "lean310", "lean39", "websocket", "dockerize"]
+        target: ["dev", "lean", "lean310", "websocket", "dockerize"]
         platform: ["linux/amd64", "linux/arm64"]
       fail-fast: false
     steps:

diff --git a/scripts/docker_build_push.sh b/scripts/docker_build_push.sh
@@ -68,6 +68,8 @@ else
   DEV_TAG="${REPO_NAME}:${LATEST_TAG}-dev"
 fi
 
+BUILD_ARG="3.9-slim-bookworm"
+
 case "${TARGET}" in
   "dev")
     DOCKER_TAGS="-t ${REPO_NAME}:${SHA}-dev -t ${REPO_NAME}:${REFSPEC}-dev -t ${DEV_TAG}"
@@ -82,11 +84,6 @@ case "${TARGET}" in
     BUILD_TARGET="lean"
     BUILD_ARG="3.10-slim-bookworm"
     ;;
-  "lean39")
-    DOCKER_TAGS="-t ${REPO_NAME}:${SHA}-py39 -t ${REPO_NAME}:${REFSPEC}-py39 -t ${REPO_NAME}:${LATEST_TAG}-py39"
-    BUILD_TARGET="lean"
-    BUILD_ARG="3.9-slim-bullseye"
-    ;;
   "websocket")
     DOCKER_TAGS="-t ${REPO_NAME}:${SHA}-websocket -t ${REPO_NAME}:${REFSPEC}-websocket -t ${REPO_NAME}:${LATEST_TAG}-websocket"
     BUILD_TARGET=""
@@ -138,6 +135,7 @@ docker buildx build \
   --label "sha=${SHA}" \
   --label "built_at=$(date)" \
   --label "target=${TARGET}" \
+  --label "base=${PY_VER}" \
   --label "build_actor=${GITHUB_ACTOR}" \
   ${BUILD_ARG:+--build-arg PY_VER="${BUILD_ARG}"} \
   ${DOCKER_CONTEXT}