This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-ci-docker.git
commit 20225e26efcbaeb74301aab2ba096c0f84bada63 Author: Sergey Nuyanzin <[email protected]> AuthorDate: Wed Oct 21 21:33:53 2026 +0200 [FLINK-41049][ci] Make pre-downloaded Maven usable by the only-script Maven wrapper This closes #9 --- base/Dockerfile | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 4efd27e..1d13739 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -94,7 +94,6 @@ RUN mkdir -p /usr/share/hugo \ # Install maven ARG MAVEN_VERSION=3.8.6 -ARG USER_HOME_DIR="/root" ARG BASE_URL=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${MAVEN_VERSION} RUN mkdir -p /usr/share/maven \ @@ -105,22 +104,50 @@ RUN mkdir -p /usr/share/maven \ ENV MAVEN_HOME /usr/share/maven -# Download the Maven Wrapper once, then use it to stage its jar and pre-warm the -# Maven distribution cache, so CI's ./mvnw needs no network to bootstrap. -ARG MAVEN_WARM_VERSIONS="3.8.6 3.9.16" +# Pre-warm the Maven distribution cache for both the jar-based and the only-script +# Maven Wrapper (they use different cache layouts), so CI's ./mvnw needs no network to bootstrap. +# Entries are <version>:<sha256 of apache-maven-<version>-bin.zip>; distributionUrl must match Flink's byte for byte. +# The jar-based wrapper only checks that the zip exists once unpacked, so it is replaced with an empty placeholder. +# Each wrapper is then re-run through a dead proxy to fail the build if it would still go to the network. +# MAVEN_USER_HOME is honored by both wrappers and lives outside /root, so the cache is found regardless of $HOME or uid; +# it is world-writable so versions not pre-warmed here can still be downloaded by any user. +ENV MAVEN_USER_HOME=/opt/maven-user-home +ARG MAVEN_WARM="3.8.6:ccf20a80e75a17ffc34d47c5c95c98c39d426ca17d670f09cd91e877072a9309 3.9.16:5af3b743dd8b876b5c45da33b676251e5f1687712644abb4ee519ca56e1d89ce" ARG MAVEN_WRAPPER_VERSION=3.3.4 RUN set -eux; \ work="$(mktemp -d)"; cd "$work"; \ - curl -fsSL -o d.zip "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper-distribution/${MAVEN_WRAPPER_VERSION}/maven-wrapper-distribution-${MAVEN_WRAPPER_VERSION}-bin.zip";; \ - unzip -q d.zip; chmod +x mvnw; \ - mkdir -p /opt/maven-wrapper; \ - cp .mvn/wrapper/maven-wrapper.jar "/opt/maven-wrapper/maven-wrapper-${MAVEN_WRAPPER_VERSION}.jar"; \ - for v in $MAVEN_WARM_VERSIONS; do \ - printf 'distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/%s/apache-maven-%s-bin.zip\n' "$v" "$v" > .mvn/wrapper/maven-wrapper.properties; \ - ./mvnw --version; \ + base="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper-distribution/${MAVEN_WRAPPER_VERSION}/maven-wrapper-distribution-${MAVEN_WRAPPER_VERSION}";; \ + for type in bin only-script; do \ + mkdir -p "$type/.mvn/wrapper"; \ + curl -fsSL -o "$type.zip" "${base}-${type}.zip"; \ + unzip -q "$type.zip" -d "$type"; chmod +x "$type/mvnw"; \ + done; \ + for entry in $MAVEN_WARM; do \ + v="${entry%%:*}"; sha="${entry#*:}"; \ + for type in bin only-script; do \ + printf 'distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/%s/apache-maven-%s-bin.zip\ndistributionSha256Sum=%s\n' "$v" "$v" "$sha" > "$type/.mvn/wrapper/maven-wrapper.properties"; \ + (cd "$type" && ./mvnw --version); \ + done; \ + for zip in "$MAVEN_USER_HOME"/wrapper/dists/apache-maven-"$v"-bin/*/apache-maven-"$v"-bin.zip; do : > "$zip"; done; \ + for type in bin only-script; do \ + (cd "$type" && https_proxy=http://127.0.0.1:9 MAVEN_OPTS="-Dhttps.proxyHost=127.0.0.1 -Dhttps.proxyPort=9" ./mvnw --version); \ + done; \ done; \ + chmod -R a+rwX "$MAVEN_USER_HOME"; \ cd /; rm -rf "$work" +# Stage the maven-wrapper jars used by Flink branches; Flink's CI copies the matching one into .mvn/wrapper +# instead of downloading it, and ./mvnw still validates it. Entries are <version>:<sha256 of maven-wrapper-<version>.jar>. +ARG MAVEN_WRAPPER_JARS="3.2.0:e63a53cfb9c4d291ebe3c2b0edacb7622bbc480326beaa5a0456e412f52f066a 3.3.2:3d8f20ce6103913be8b52aef6d994e0c54705fb527324ceb9b835b338739c7a8 3.3.4:4e2fbf6554bc8a4702cdfdd3bef464f423393d784ddbb037216320ce55d5e4e1" +RUN set -eux; \ + mkdir -p /opt/maven-wrapper; \ + for entry in $MAVEN_WRAPPER_JARS; do \ + v="${entry%%:*}"; sha="${entry#*:}"; jar="/opt/maven-wrapper/maven-wrapper-$v.jar"; \ + curl -fsSL -o "$jar" "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/$v/maven-wrapper-$v.jar";; \ + echo "$sha $jar" | sha256sum -c -; \ + done; \ + chmod -R a+rX /opt/maven-wrapper + # Use UTF-8 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen ; locale-gen ; update-locale en_US.UTF-8 ENV LC_ALL "en_US.UTF-8"
