From 8280cc457e6f2ab72bda92d70d5ab5f23cc3f58b Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 23 Jan 2026 14:01:27 +0200 Subject: [PATCH 1/2] [improve][misc] Upgrade to Alpine 3.23 --- docker/kinesis-producer-alpine/Dockerfile | 2 +- docker/pulsar/Dockerfile | 2 +- src/update_python_protobuf_stubs_with_docker.sh | 4 ++-- .../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 05e0a326daca2..5ec98ab3a766f 100644 --- a/docker/kinesis-producer-alpine/Dockerfile +++ b/docker/kinesis-producer-alpine/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -ARG ALPINE_VERSION=3.22 +ARG ALPINE_VERSION=3.23 # Builds an Alpine image with kinesis_producer compiled for Alpine Linux / musl diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index b671cac340447..40a3614ab6f5e 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -ARG ALPINE_VERSION=3.22 +ARG ALPINE_VERSION=3.23 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 4e0b5568bc35a..2e095418d1ba3 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.22 base image and mount the current directory to it as the +# Create an inline docker container with alpine:3.23 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.22 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.23 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 9fa7566a18357..2dd750b60e3a8 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 @@ -57,7 +57,7 @@ public abstract class PulsarContainer> 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.22"; + public static final String ALPINE_IMAGE_NAME = "alpine:3.23"; 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", From 9fe44528922d1c78d6def56142c4ec240f40783a Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 23 Jan 2026 14:40:19 +0200 Subject: [PATCH 2/2] Fix snappy build --- docker/pulsar/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 40a3614ab6f5e..6494168f38ee5 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -73,9 +73,9 @@ RUN echo networkaddress.cache.negative.ttl=1 >> /opt/jvm/conf/security/java.secu FROM alpine:$ALPINE_VERSION AS snappy-java ARG SNAPPY_VERSION -RUN apk add git alpine-sdk util-linux cmake autoconf automake libtool openjdk17 maven curl bash tar -ENV JAVA_HOME=/usr -RUN curl -Ls https://github.com/xerial/snappy-java/archive/refs/tags/v$SNAPPY_VERSION.tar.gz | tar zxf - && cd snappy-java-$SNAPPY_VERSION && make clean-native native +RUN apk add git alpine-sdk util-linux cmake autoconf automake libtool openjdk17 maven curl bash tar findutils +ENV JAVA_HOME=/usr/lib/jvm/default-jvm +RUN curl -Ls https://github.com/xerial/snappy-java/archive/refs/tags/v$SNAPPY_VERSION.tar.gz | tar zxf - && cd snappy-java-$SNAPPY_VERSION && CMAKE_POLICY_VERSION_MINIMUM=3.5 make clean-native native ## Create final stage from Alpine image