From 7bf70ed638fac701c60e2fb29217af7c38056a8c Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 26 Aug 2019 23:49:22 +0200 Subject: [docker] use AdoptOpenJdk for all java releases, and add the latest version for all supported build systems --- docker/provision/ant/ant-1.10.1.sh | 2 +- docker/provision/ant/ant-1.10.6.sh | 4 ++++ docker/provision/bazel/bazel-0.28.1.sh | 4 ++++ docker/provision/gradle/gradle-5.6.sh | 4 ++++ docker/provision/jdk/java-10.sh | 4 ++-- docker/provision/jdk/java-11.sh | 4 ++-- docker/provision/jdk/java-12.sh | 4 ++++ docker/provision/jdk/java-8.sh | 10 ++++------ docker/provision/jdk/java-9.sh | 4 ++-- docker/provision/maven/maven-3.6.1.sh | 4 ++++ 10 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 docker/provision/ant/ant-1.10.6.sh create mode 100644 docker/provision/bazel/bazel-0.28.1.sh create mode 100644 docker/provision/gradle/gradle-5.6.sh create mode 100644 docker/provision/jdk/java-12.sh create mode 100644 docker/provision/maven/maven-3.6.1.sh (limited to 'docker/provision') diff --git a/docker/provision/ant/ant-1.10.1.sh b/docker/provision/ant/ant-1.10.1.sh index 3de7f3d0..9105f400 100755 --- a/docker/provision/ant/ant-1.10.1.sh +++ b/docker/provision/ant/ant-1.10.1.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.gz -O ant.tar.gz mkdir /usr/local/apache-ant/ && tar xvf ant.tar.gz -C /usr/local/apache-ant/ -mv /usr/local/apache-ant/apache-ant-1.10.1 /usr/local/apache-ant/apache-ant +mv /usr/local/apache-ant/apache-ant-1.10.1 /usr/local/apache-ant/apache-ant \ No newline at end of file diff --git a/docker/provision/ant/ant-1.10.6.sh b/docker/provision/ant/ant-1.10.6.sh new file mode 100644 index 00000000..66cfe9e4 --- /dev/null +++ b/docker/provision/ant/ant-1.10.6.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.6-bin.tar.gz -O ant.tar.gz +mkdir /usr/local/apache-ant/ && tar xvf ant.tar.gz -C /usr/local/apache-ant/ +mv /usr/local/apache-ant/apache-ant-1.10.6 /usr/local/apache-ant/apache-ant \ No newline at end of file diff --git a/docker/provision/bazel/bazel-0.28.1.sh b/docker/provision/bazel/bazel-0.28.1.sh new file mode 100644 index 00000000..054915d3 --- /dev/null +++ b/docker/provision/bazel/bazel-0.28.1.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget pkg-config zip g++ zlib1g-dev unzip python +wget https://github.com/bazelbuild/bazel/releases/download/0.28.1/bazel-0.28.1-installer-linux-x86_64.sh -O bazel-installer.sh +chmod +x bazel-installer.sh +./bazel-installer.sh --prefix=/opt/bazel \ No newline at end of file diff --git a/docker/provision/gradle/gradle-5.6.sh b/docker/provision/gradle/gradle-5.6.sh new file mode 100644 index 00000000..ab34da42 --- /dev/null +++ b/docker/provision/gradle/gradle-5.6.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget unzip +wget https://services.gradle.org/distributions/gradle-5.6-bin.zip -O gradle.zip +mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip +mv /opt/gradle/gradle-5.6 /opt/gradle/gradle diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh index 4cf75f60..51aebd25 100755 --- a/docker/provision/jdk/java-10.sh +++ b/docker/provision/jdk/java-10.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz +wget https://github.com/AdoptOpenJDK/openjdk10-releases/releases/download/jdk-10.0.2%2B13/OpenJDK10_x64_Linux_jdk-10.0.2%2B13.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt/ -mv /opt/jdk-10.0.2 /opt/jdk +mv /opt/jdk-10.0.2+13 /opt/jdk diff --git a/docker/provision/jdk/java-11.sh b/docker/provision/jdk/java-11.sh index 6252c2ae..21f4e949 100644 --- a/docker/provision/jdk/java-11.sh +++ b/docker/provision/jdk/java-11.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz +wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt/ -mv /opt/jdk-11.0.2 /opt/jdk \ No newline at end of file +mv /opt/jdk-11.0.4+11 /opt/jdk \ No newline at end of file diff --git a/docker/provision/jdk/java-12.sh b/docker/provision/jdk/java-12.sh new file mode 100644 index 00000000..6598d56c --- /dev/null +++ b/docker/provision/jdk/java-12.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz -O jdk.tar.gz +tar -xzf jdk.tar.gz -C /opt/ +mv /opt/jdk-12.0.2+10 /opt/jdk \ No newline at end of file diff --git a/docker/provision/jdk/java-8.sh b/docker/provision/jdk/java-8.sh index 44795c6c..7875ef2c 100755 --- a/docker/provision/jdk/java-8.sh +++ b/docker/provision/jdk/java-8.sh @@ -1,6 +1,4 @@ -apt-get update && apt-get install -y software-properties-common -echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections -add-apt-repository -y ppa:webupd8team/java -apt-get update && apt-get install -y oracle-java8-installer - -mv /usr/lib/jvm/java-8-oracle /opt/jdk +apt-get update && apt-get install -y wget +wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz -O jdk.tar.gz +tar -xzf jdk.tar.gz -C /opt/ +mv /opt/jdk8u222-b10 /opt/jdk \ No newline at end of file diff --git a/docker/provision/jdk/java-9.sh b/docker/provision/jdk/java-9.sh index 483c1a28..4b4bac90 100755 --- a/docker/provision/jdk/java-9.sh +++ b/docker/provision/jdk/java-9.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz -O jdk.tar.gz +wget https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt/ -mv /opt/jdk-9.0.4 /opt/jdk +mv /opt/jdk-9.0.4+11 /opt/jdk diff --git a/docker/provision/maven/maven-3.6.1.sh b/docker/provision/maven/maven-3.6.1.sh new file mode 100644 index 00000000..d8a8be64 --- /dev/null +++ b/docker/provision/maven/maven-3.6.1.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.tar.gz -O maven.tar.gz +mkdir /usr/local/apache-maven/ && tar xvf maven.tar.gz -C /usr/local/apache-maven/ +mv /usr/local/apache-maven/apache-maven-3.6.1 /usr/local/apache-maven/apache-maven -- cgit