You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ar...@apache.org on 2022/01/15 09:03:34 UTC

svn commit: r1897082 - /openoffice/devtools/build-scripts/4.2.0/containers/linux/Dockerfile

Author: ardovm
Date: Sat Jan 15 09:03:33 2022
New Revision: 1897082

URL: http://svn.apache.org/viewvc?rev=1897082&view=rev
Log:
Add OpenJDK 1.7.0 that is required by the 4.2.0-Dev3 build script.
Update Apache Ant to 1.9.16 because 1.9.15 is not provided any more by
dlcdn.a.o

Modified:
    openoffice/devtools/build-scripts/4.2.0/containers/linux/Dockerfile

Modified: openoffice/devtools/build-scripts/4.2.0/containers/linux/Dockerfile
URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0/containers/linux/Dockerfile?rev=1897082&r1=1897081&r2=1897082&view=diff
==============================================================================
--- openoffice/devtools/build-scripts/4.2.0/containers/linux/Dockerfile (original)
+++ openoffice/devtools/build-scripts/4.2.0/containers/linux/Dockerfile Sat Jan 15 09:03:33 2022
@@ -10,6 +10,7 @@ RUN yum install -y\
        gcc-c++ \
        cups-devel \
        pam-devel \
+       java-1.7.0-openjdk-devel \
        java-1.8.0-openjdk-devel \
        rpm-build \
        dpkg \
@@ -38,9 +39,10 @@ RUN yum install -y\
        perl \
        ORBit2-devel
 RUN ccache -M 2G
-RUN wget http://mirrors.nxnethosting.com/apache//ant/binaries/apache-ant-1.9.15-bin.tar.bz2
-RUN tar xvf apache-ant-1.9.15-bin.tar.bz2
-RUN mv apache-ant-1.9.15 ant
+RUN wget https://dlcdn.apache.org/ant/binaries/apache-ant-1.9.16-bin.tar.bz2
+RUN tar xvf apache-ant-1.9.16-bin.tar.bz2
+RUN mv apache-ant-1.9.16 ant
+ENV ANT_HOME=/ant
 RUN yum install \
        cpan \
        perl-libwww-perl \