diff options
| author | Jiayu Liu <jiayu.liu@airbnb.com> | 2022-04-19 04:18:58 +0200 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2022-04-19 18:40:52 +0200 |
| commit | 5d220eb3321aa571b316da942feb72c29c7386c1 (patch) | |
| tree | f4abfee6e0c27518187c9e65de095d524429c07b /build/docker | |
| parent | a8fded497635f2a319ece3882b234f510d84cacd (diff) | |
| download | thrift-5d220eb3321aa571b316da942feb72c29c7386c1.tar.gz | |
THRIFT-5562: remove gradle wrapper and use installed gradle 6.9
Client: java
Patch: Jiayu Liu
This closes #2576
Diffstat (limited to 'build/docker')
| -rw-r--r-- | build/docker/ubuntu-bionic/Dockerfile | 9 | ||||
| -rw-r--r-- | build/docker/ubuntu-disco/Dockerfile | 9 | ||||
| -rw-r--r-- | build/docker/ubuntu-xenial/Dockerfile | 10 |
3 files changed, 25 insertions, 3 deletions
diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index 0e11d2ac6..e69df5ab3 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -149,12 +149,19 @@ RUN apt-get install -y --no-install-recommends \ haxelib setup --always /usr/share/haxe/lib && \ haxelib install --always hxcpp 2>&1 > /dev/null +ENV GRADLE_VERSION="6.9.2" RUN apt-get install -y --no-install-recommends \ `# Java dependencies` \ ant \ ant-optional \ maven \ - openjdk-11-jdk-headless + openjdk-11-jdk-headless && \ +`# Gradle` \ + wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ + (echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ + unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ + mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ + ln -s /usr/local/gradle/bin/gradle /usr/local/bin RUN apt-get install -y --no-install-recommends \ `# Lua dependencies` \ diff --git a/build/docker/ubuntu-disco/Dockerfile b/build/docker/ubuntu-disco/Dockerfile index 45bef96d6..4f1de2d9d 100644 --- a/build/docker/ubuntu-disco/Dockerfile +++ b/build/docker/ubuntu-disco/Dockerfile @@ -148,12 +148,19 @@ RUN apt-get install -y --no-install-recommends \ haxelib setup --always /usr/share/haxe/lib && \ haxelib install --always hxcpp 2>&1 > /dev/null +ENV GRADLE_VERSION="6.9.2" RUN apt-get install -y --no-install-recommends \ `# Java dependencies` \ ant \ ant-optional \ maven \ - openjdk-11-jdk-headless + openjdk-11-jdk-headless && \ +`# Gradle` \ + wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ + (echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ + unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ + mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ + ln -s /usr/local/gradle/bin/gradle /usr/local/bin RUN apt-get install -y --no-install-recommends \ `# Lua dependencies` \ diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile index 1428fac00..7f856ff4b 100644 --- a/build/docker/ubuntu-xenial/Dockerfile +++ b/build/docker/ubuntu-xenial/Dockerfile @@ -155,12 +155,20 @@ RUN apt-get install -y --no-install-recommends \ haxelib install --always hxcpp 3.4.64 2>&1 > /dev/null # note: hxcpp 3.4.185 (latest) no longer ships static libraries, and caused a build failure +ENV GRADLE_VERSION="6.9.2" RUN apt-get install -y --no-install-recommends \ `# Java dependencies` \ ant \ ant-optional \ openjdk-8-jdk \ - maven + maven \ + unzip && \ +`# Gradle` \ + wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ + (echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ + unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ + mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ + ln -s /usr/local/gradle/bin/gradle /usr/local/bin # disabled: same as ubuntu-bionic jobs # RUN apt-get install -y --no-install-recommends \ |