Skip to content

Commit

Permalink
More 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
adamsdarlingtower committed Apr 11, 2024
1 parent 482f01f commit 6bea37a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
10 changes: 5 additions & 5 deletions cloud-build/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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) ||
Expand All @@ -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) ||
Expand All @@ -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) ||
Expand All @@ -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) ||
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cloud-build/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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) ||
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_build_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 6bea37a

Please sign in to comment.