feat(build): use latest patch version for Python base image (#44458)
Signed-off-by: hainenber <dotronghai96@gmail.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# Keep this in sync with the base image in the main Dockerfile (ARG PY_VER)
|
||||
FROM python:3.11.13-trixie AS base
|
||||
FROM python:3.11-trixie AS base
|
||||
|
||||
# Install system dependencies that Superset needs
|
||||
# This layer will be cached across Codespace sessions
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "Apache Superset Development",
|
||||
// Keep this in sync with the base image in Dockerfile (ARG PY_VER)
|
||||
// Using the same base as Dockerfile, but non-slim for dev tools
|
||||
"image": "python:3.11.13-bookworm",
|
||||
"image": "python:3.11-bookworm",
|
||||
|
||||
"features": {
|
||||
"ghcr.io/devcontainers/features/docker-in-docker:2": {
|
||||
|
||||
14
.github/workflows/docker.yml
vendored
14
.github/workflows/docker.yml
vendored
@@ -214,9 +214,9 @@ jobs:
|
||||
snapshot="$(mktemp -d)/docker-build-extra-flags.sh"
|
||||
cp scripts/docker-build-extra-flags.sh "$snapshot"
|
||||
release_tree="$(mktemp -d)"
|
||||
printf 'ARG PY_VER=3.11.13-slim-bookworm\n' >"$release_tree/Dockerfile"
|
||||
printf 'ARG PY_VER=3.11-slim-bookworm\n' >"$release_tree/Dockerfile"
|
||||
flags="$(cd "$release_tree" && bash "$snapshot" superset "" release)"
|
||||
if ! grep -Fq -- "--build-arg PY_VER=3.11.13-slim-bookworm" <<<"$flags"; then
|
||||
if ! grep -Fq -- "--build-arg PY_VER=3.11-slim-bookworm" <<<"$flags"; then
|
||||
echo "::error::release build ignored the checked-out Dockerfile's PY_VER (flags: $flags)"
|
||||
exit 1
|
||||
fi
|
||||
@@ -245,8 +245,8 @@ jobs:
|
||||
assert_publish_guard pull_request refs/pull/44250/merge aaaa111 bbbb222 true
|
||||
assert_supersetbot_exports_cache_with_token superset
|
||||
for preset in superset dev lean; do
|
||||
assert_effective_py_ver "$preset" "3.11.14-slim-trixie"
|
||||
expected_cache="3.11.14-slim-trixie"
|
||||
assert_effective_py_ver "$preset" "3.11-slim-trixie"
|
||||
expected_cache="3.11-slim-trixie"
|
||||
if [ "$preset" != "superset" ]; then
|
||||
expected_cache="${expected_cache}-${preset}"
|
||||
fi
|
||||
@@ -264,9 +264,9 @@ jobs:
|
||||
assert_master_tag lean master-lean
|
||||
assert_master_tag py311 master-py311
|
||||
assert_master_tag py312 master-py312
|
||||
assert_cache_push_for_master superset "3.11.14-slim-trixie"
|
||||
assert_cache_push_for_master dev "3.11.14-slim-trixie-dev"
|
||||
assert_cache_push_for_master lean "3.11.14-slim-trixie-lean"
|
||||
assert_cache_push_for_master superset "3.11-slim-trixie"
|
||||
assert_cache_push_for_master dev "3.11-slim-trixie-dev"
|
||||
assert_cache_push_for_master lean "3.11-slim-trixie-lean"
|
||||
assert_cache_push_for_master py311 "3.11-slim-bookworm"
|
||||
assert_cache_push_for_master py312 "3.12-slim-bookworm"
|
||||
assert_release_tag superset "6.1.0"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
######################################################################
|
||||
# Node stage to deal with static asset construction
|
||||
######################################################################
|
||||
ARG PY_VER=3.11.14-slim-trixie
|
||||
ARG PY_VER=3.11-slim-trixie
|
||||
|
||||
# If BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise).
|
||||
ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
|
||||
|
||||
@@ -71,7 +71,7 @@ x-common-build: &common-build
|
||||
context: .
|
||||
target: ${SUPERSET_BUILD_TARGET:-dev} # dev (default, live-reload); also `superset` (batteries-included) or `lean` (minimal)
|
||||
cache_from:
|
||||
- apache/superset-cache:3.11.14-slim-trixie
|
||||
- apache/superset-cache:3.11-slim-trixie
|
||||
args:
|
||||
DEV_MODE: "true"
|
||||
INCLUDE_CHROMIUM: ${INCLUDE_CHROMIUM:-false}
|
||||
|
||||
@@ -36,7 +36,7 @@ x-common-build: &common-build
|
||||
# and `superset` bundles the metadata/analytics drivers it needs.
|
||||
target: superset
|
||||
cache_from:
|
||||
- apache/superset-cache:3.11.14-slim-trixie
|
||||
- apache/superset-cache:3.11-slim-trixie
|
||||
|
||||
services:
|
||||
redis:
|
||||
|
||||
@@ -39,7 +39,7 @@ x-common-build: &common-build
|
||||
context: .
|
||||
target: ${SUPERSET_BUILD_TARGET:-dev} # dev (default, live-reload); also `superset` (batteries-included) or `lean` (minimal)
|
||||
cache_from:
|
||||
- apache/superset-cache:3.11.14-slim-trixie
|
||||
- apache/superset-cache:3.11-slim-trixie
|
||||
args:
|
||||
DEV_MODE: "true"
|
||||
INCLUDE_CHROMIUM: ${INCLUDE_CHROMIUM:-false}
|
||||
|
||||
Reference in New Issue
Block a user