From 6bea37af5c5926c51f9e21181a2e70faa5f3d2ed Mon Sep 17 00:00:00 2001
From: Adams Tower <adams.tower@tartansolutions.com>
Date: Thu, 11 Apr 2024 18:50:11 -0400
Subject: [PATCH] More 3.10

---
 Dockerfile                   |  2 +-
 cloud-build/dev.yaml         | 10 +++++-----
 cloud-build/node.yaml        |  4 ++--
 scripts/docker_build_push.sh |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e73be7e9b4498..d5313b5027c49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@
 ######################################################################
 # Node stage to deal with static asset construction
 ######################################################################
-ARG PY_VER=3.9-slim-bookworm
+ARG PY_VER=3.10-slim-bookworm
 
 # if BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise).
 ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
diff --git a/cloud-build/dev.yaml b/cloud-build/dev.yaml
index 5bac570049fbd..89f2cf0830b26 100644
--- a/cloud-build/dev.yaml
+++ b/cloud-build/dev.yaml
@@ -14,7 +14,7 @@ steps:
       #   -t us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-py:$TAG_NAME \
       #   --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-py:$(cat tmp/py) \
       #   --target=superset-py \
-      #   --build-arg PY_VER=3.9 \
+      #   --build-arg PY_VER=3.10 \
       #   .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/node) ||
@@ -24,7 +24,7 @@ steps:
         -t us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$(cat tmp/node) \
         --target=superset-node \
-        --build-arg PY_VER=3.9 \
+        --build-arg PY_VER=3.10 \
         .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/production) ||
@@ -35,7 +35,7 @@ steps:
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$(cat tmp/production) \
         --target lean \
-        --build-arg PY_VER=3.9 \
+        --build-arg PY_VER=3.10 \
         .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-ci:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/ci) ||
@@ -47,7 +47,7 @@ steps:
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$TAG_NAME \
         --cache-from gus-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-ci:$(cat tmp/ci) \
         --target lean \
-        --build-arg PY_VER=3.9 \
+        --build-arg PY_VER=3.10 \
         .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-dev:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/dev) ||
@@ -59,7 +59,7 @@ steps:
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-ci:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-dev:$(cat tmp/dev) \
-        --build-arg PY_VER=3.9 \
+        --build-arg PY_VER=3.10 \
         .
 
 substitutions:
diff --git a/cloud-build/node.yaml b/cloud-build/node.yaml
index e2e7f51cf2bbd..179fccc4a40f9 100644
--- a/cloud-build/node.yaml
+++ b/cloud-build/node.yaml
@@ -14,7 +14,7 @@ steps:
       #   -t us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-py:$TAG_NAME \
       #   --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-py:$(cat tmp/py) \
       #   --target=superset-py \
-      #   --build-arg PY_VER=3.8.12 \
+      #   --build-arg PY_VER=3.10 \
       #   .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/node) ||
@@ -24,7 +24,7 @@ steps:
         -t us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$(cat tmp/node) \
         --target=superset-node \
-        --build-arg PY_VER=3.8.12 \
+        --build-arg PY_VER=3.10 \
         .
 substitutions:
   _LAST_TAG: "latest"
diff --git a/scripts/docker_build_push.sh b/scripts/docker_build_push.sh
index 80d08c47e3006..5eb50a4f057af 100755
--- a/scripts/docker_build_push.sh
+++ b/scripts/docker_build_push.sh
@@ -149,7 +149,7 @@ docker buildx build --target lean \
   -t "${REPO_NAME}:${REFSPEC}-py39" \
   -t "${REPO_NAME}:${LATEST_TAG}-py39" \
   --platform linux/amd64 \
-  --build-arg PY_VER="3.9-slim-bullseye"\
+  --build-arg PY_VER="3.10-slim-bookworm"\
   --label "sha=${SHA}" \
   --label "built_at=$(date)" \
   --label "target=lean39" \