From 113c296a63756ef447e37527efc9633768b50da3 Mon Sep 17 00:00:00 2001
From: victorc <v.citiriga@siatel.ro>
Date: Mon, 23 Sep 2024 09:41:29 +0000
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fca638d..7e62cf4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,30 @@
-FROM frekele/ant:1.10.3-jdk8
+# adapted from frekele/ant
+FROM frekele/java:jdk8
 
-WORKDIR /opt/ant/lib
+ENV ANT_VERSION=1.10.3
+ENV ANT_HOME=/opt/ant
 
-RUN wget https://repo1.maven.org/maven2/com/jcraft/jsch/0.1.55/jsch-0.1.55.jar
+# change to tmp folder
+WORKDIR /tmp
 
-WORKDIR /root
+# Download and extract apache ant to opt folder
+RUN wget --no-check-certificate --no-cookies http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz \
+    && wget --no-check-certificate --no-cookies http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz.sha512 \
+    && echo "$(cat apache-ant-${ANT_VERSION}-bin.tar.gz.sha512) apache-ant-${ANT_VERSION}-bin.tar.gz" | sha512sum -c \
+    && tar -zvxf apache-ant-${ANT_VERSION}-bin.tar.gz -C /opt/ \
+    && ln -s /opt/apache-ant-${ANT_VERSION} /opt/ant \
+    && rm -f apache-ant-${ANT_VERSION}-bin.tar.gz \
+    && rm -f apache-ant-${ANT_VERSION}-bin.tar.gz.sha512
+
+RUN wget --no-check-certificate --no-cookies https://repo1.maven.org/maven2/com/jcraft/jsch/0.1.55/jsch-0.1.55.jar \
+    && mv jsch-0.1.55.jar /opt/ant/lib
+
+# add executables to path
+RUN update-alternatives --install "/usr/bin/ant" "ant" "/opt/ant/bin/ant" 1 && \
+    update-alternatives --set "ant" "/opt/ant/bin/ant" 
+
+# Add the files
+ADD rootfs /
+
+# change to root folder
+WORKDIR /root
\ No newline at end of file