[docker] upgrade ant

projectlombok · Apr 1, 2021 · a9adc23 · a9adc23
1 parent 4637b9d
commit a9adc23
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/docker/ant/Dockerfile b/docker/ant/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 as downloader
+FROM ubuntu:20.04 as downloader
 
 ARG jdk=16
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
@@ -7,11 +7,11 @@ RUN provision/jdk/java-${jdk}.sh
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
 
-ARG ant=1.10.7
+ARG ant=1.10.9
 ADD provision/ant/ant-${ant}.sh provision/ant/ant-${ant}.sh
 RUN provision/ant/ant-${ant}.sh
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 COPY --from=downloader /usr/local/apache-ant/ /usr/local/apache-ant/
 COPY --from=downloader /opt/jdk/ /opt/jdk/

diff --git a/docker/ant/readme.md b/docker/ant/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG ant=1.10.7`
+### `ARG ant=1.10.9`
 
 The ant version to be used. Supported values:
 
-- `1.10.7` (default)
+- `1.10.9` (default)
+- `1.10.7`
 - `1.10.6`
 - `1.10.1`
 

diff --git a/docker/provision/ant/ant-1.10.9.sh b/docker/provision/ant/ant-1.10.9.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.9-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.9 /usr/local/apache-ant/apache-ant