From 1f7b8c3d2c5dc1afc59faaedee94abeefcffec3c Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Tue, 28 Nov 2017 23:37:34 +0100
Subject: add ant Dockerfile, use jdk major version numbers instead

---
 docker/provision/ant/ant-1.10.1.sh | 4 ++++
 docker/provision/jdk/java-1.8.sh   | 6 ------
 docker/provision/jdk/java-1.9.sh   | 4 ----
 docker/provision/jdk/java-8.sh     | 6 ++++++
 docker/provision/jdk/java-9.sh     | 4 ++++
 5 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 docker/provision/ant/ant-1.10.1.sh
 delete mode 100644 docker/provision/jdk/java-1.8.sh
 delete mode 100644 docker/provision/jdk/java-1.9.sh
 create mode 100644 docker/provision/jdk/java-8.sh
 create mode 100644 docker/provision/jdk/java-9.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
new file mode 100644
index 00000000..3de7f3d0
--- /dev/null
+++ b/docker/provision/ant/ant-1.10.1.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.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
diff --git a/docker/provision/jdk/java-1.8.sh b/docker/provision/jdk/java-1.8.sh
deleted file mode 100644
index 44795c6c..00000000
--- a/docker/provision/jdk/java-1.8.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/docker/provision/jdk/java-1.9.sh b/docker/provision/jdk/java-1.9.sh
deleted file mode 100644
index 2023ae39..00000000
--- a/docker/provision/jdk/java-1.9.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-apt-get update && apt-get install -y wget
-wget --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/9.0.1+11/jdk-9.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz
-tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-9.0.1 /opt/jdk
diff --git a/docker/provision/jdk/java-8.sh b/docker/provision/jdk/java-8.sh
new file mode 100644
index 00000000..44795c6c
--- /dev/null
+++ b/docker/provision/jdk/java-8.sh
@@ -0,0 +1,6 @@
+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
diff --git a/docker/provision/jdk/java-9.sh b/docker/provision/jdk/java-9.sh
new file mode 100644
index 00000000..2023ae39
--- /dev/null
+++ b/docker/provision/jdk/java-9.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/9.0.1+11/jdk-9.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk-9.0.1 /opt/jdk
-- 
cgit