This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.1 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 1ce3d0a587d5f68211dface145264813bef83dd7 Author: Lari Hotari <[email protected]> AuthorDate: Mon Oct 13 18:17:40 2025 +0300 [improve] Upgrade Alpine base image to 3.22 version (#24840) (cherry picked from commit 15daf18a877cddc3786dc0661fde0e049bac916a) --- docker/kinesis-producer-alpine/Dockerfile | 2 +- docker/pulsar/Dockerfile | 2 +- src/update_python_protobuf_stubs_with_docker.sh | 4 ++-- .../apache/pulsar/tests/integration/containers/PulsarContainer.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/kinesis-producer-alpine/Dockerfile b/docker/kinesis-producer-alpine/Dockerfile index a33dc82f158..05e0a326dac 100644 --- a/docker/kinesis-producer-alpine/Dockerfile +++ b/docker/kinesis-producer-alpine/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION=3.22 # Builds an Alpine image with kinesis_producer compiled for Alpine Linux / musl diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 2658d03fce0..b671cac3404 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION=3.22 ARG IMAGE_JDK_MAJOR_VERSION=21 # First create a stage with just the Pulsar tarball and scripts diff --git a/src/update_python_protobuf_stubs_with_docker.sh b/src/update_python_protobuf_stubs_with_docker.sh index ece0b5096d7..4e0b5568bc3 100755 --- a/src/update_python_protobuf_stubs_with_docker.sh +++ b/src/update_python_protobuf_stubs_with_docker.sh @@ -20,6 +20,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -# Create an inline docker container with alpine:3.21 base image and mount the current directory to it as the +# Create an inline docker container with alpine:3.22 base image and mount the current directory to it as the # working directory and run the script inside the container. -docker run --rm -v "$SCRIPT_DIR/..:/pulsar_src" -w /pulsar_src alpine:3.21 sh -c 'apk add --no-cache bash python3 && /pulsar_src/src/update_python_protobuf_stubs.sh' \ No newline at end of file +docker run --rm -v "$SCRIPT_DIR/..:/pulsar_src" -w /pulsar_src alpine:3.22 sh -c 'apk add --no-cache bash python3 && /pulsar_src/src/update_python_protobuf_stubs.sh' \ No newline at end of file diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java index 104590045ce..692bca25896 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java @@ -51,7 +51,7 @@ public abstract class PulsarContainer<SelfT extends PulsarContainer<SelfT>> exte public static final int BROKER_HTTP_PORT = 8080; public static final int BROKER_HTTPS_PORT = 8081; - public static final String ALPINE_IMAGE_NAME = "alpine:3.20"; + public static final String ALPINE_IMAGE_NAME = "alpine:3.22"; public static final String DEFAULT_IMAGE_NAME = System.getenv().getOrDefault("PULSAR_TEST_IMAGE_NAME", "apachepulsar/pulsar-test-latest-version:latest"); public static final String UPGRADE_TEST_IMAGE_NAME = System.getenv().getOrDefault("PULSAR_UPGRADE_TEST_IMAGE_NAME",
