commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject svn commit: r1807084 - in /commons/proper/jelly/branches/1.X: Dockerfile docker/ docker/answer.txt docker/install.sh
Date Sat, 02 Sep 2017 19:21:54 GMT
Author: chtompki
Date: Sat Sep  2 19:21:53 2017
New Revision: 1807084

URL: http://svn.apache.org/viewvc?rev=1807084&view=rev
Log:
Adding docker supplement files, build works with this setup

Added:
    commons/proper/jelly/branches/1.X/docker/
    commons/proper/jelly/branches/1.X/docker/answer.txt
    commons/proper/jelly/branches/1.X/docker/install.sh
Modified:
    commons/proper/jelly/branches/1.X/Dockerfile

Modified: commons/proper/jelly/branches/1.X/Dockerfile
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/1.X/Dockerfile?rev=1807084&r1=1807083&r2=1807084&view=diff
==============================================================================
--- commons/proper/jelly/branches/1.X/Dockerfile (original)
+++ commons/proper/jelly/branches/1.X/Dockerfile Sat Sep  2 19:21:53 2017
@@ -1,6 +1,5 @@
 # DESCRIPTION:    commons-jelly-build-env
-# IMPORTANT NOTE: please download jdk-1_5_0_22-linux-amd64.bin to
-#                 the directory sibling to this dockerfile before building.
+# REQUIRED:       jdk-1_5_0_22-linux-amd64.bin downloaded from oracle before building.
 
 FROM library/ubuntu:12.04
 
@@ -9,46 +8,10 @@ RUN apt-get -qq update && apt-get instal
 RUN mkdir -p /usr/java
 
 ADD jdk-1_5_0_22-linux-amd64.bin /tmp
-RUN echo "q" >> /tmp/answer.txt && echo "yes" >> /tmp/answer.txt
+ADD docker/answer.txt /tmp
+ADD docker/install.sh /tmp
 
-RUN cd /tmp && chmod a+x jdk-1_5_0_22-linux-amd64.bin && ./jdk-1_5_0_22-linux-amd64.bin
< answer.txt && mv ./jdk1.5.0_22/* /usr/java
-
-RUN mkdir -p /opt/ant && curl http://archive.apache.org/dist/ant/binaries/apache-ant-1.6.0-bin.tar.gz
-o /tmp/apache-ant-1.6.0-bin.tar.gz && tar -xf /tmp/apache-ant-1.6.0-bin.tar.gz -C
/opt/ant --strip-components 1
-
-RUN mkdir -p /root/commons-jelly-1.X && \
-    \
-    mkdir -p /root/.maven/repository/servletapi/jars && \
-    mkdir -p /root/.maven/repository/commons-cli/jars && \
-    mkdir -p /root/.maven/repository/commons-lang/jars && \
-    mkdir -p /root/.maven/repository/commons-discovery/jars && \
-    mkdir -p /root/.maven/repository/forehead/jars && \
-    mkdir -p /root/.maven/repository/jstl/jars && \
-    mkdir -p /root/.maven/repository/junit/jars && \
-    mkdir -p /root/.maven/repository/commons-jexl/jars && \
-    mkdir -p /root/.maven/repository/xml-apis/jars && \
-    mkdir -p /root/.maven/repository/commons-beanutils/jars && \
-    mkdir -p /root/.maven/repository/commons-collections/jars && \
-    mkdir -p /root/.maven/repository/commons-logging/jars && \
-    mkdir -p /root/.maven/repository/dom4j/jars && \
-    mkdir -p /root/.maven/repository/jaxen/jars && \
-    mkdir -p /root/.maven/repository/xerces/jars && \
-    \
-    curl 'https://search.maven.org/remotecontent?filepath=commons-cli/commons-cli/1.0/commons-cli-1.0.jar'
-o /root/.maven/repository/commons-cli/jars/commons-cli-1.0.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=commons-lang/commons-lang/2.0/commons-lang-2.0.jar'
-o /root/.maven/repository/commons-lang/jars/commons-lang-2.0.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=commons-discovery/commons-discovery/20030211.213356/commons-discovery-20030211.213356.jar'
-o /root/.maven/repository/commons-discovery/jars/commons-discovery-20030211.213356.jar &&
\
-    curl 'https://search.maven.org/remotecontent?filepath=forehead/forehead/1.0-beta-5/forehead-1.0-beta-5.jar'
-o /root/.maven/repository/forehead/jars/forehead-1.0-beta-5.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=javax/servlet/jstl/1.0.6/jstl-1.0.6.jar'
-o /root/.maven/repository/jstl/jars/jstl-1.0.6.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=junit/junit/3.8.1/junit-3.8.1.jar'
-o /root/.maven/repository/junit/jars/junit-3.8.1.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=commons-jexl/commons-jexl/1.0/commons-jexl-1.0.jar'
-o /root/.maven/repository/commons-jexl/jars/commons-jexl-1.0.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar'
-o /root/.maven/repository/xml-apis/jars/xml-apis-1.0.b2.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar'
-o /root/.maven/repository/commons-beanutils/jars/commons-beanutils-1.6.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=commons-collections/commons-collections/2.1/commons-collections-2.1.jar'
-o /root/.maven/repository/commons-collections/jars/commons-collections-2.1.jar &&
\
-    curl 'https://search.maven.org/remotecontent?filepath=commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar'
-o /root/.maven/repository/commons-logging/jars/commons-logging-1.0.3.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=dom4j/dom4j/1.5.2/dom4j-1.5.2.jar'
-o /root/.maven/repository/dom4j/jars/dom4j-1.5.2.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=jaxen/jaxen/1.1-beta-4/jaxen-1.1-beta-4.jar'
-o /root/.maven/repository/jaxen/jars/jaxen-1.1-beta-4.jar && \
-    curl 'https://search.maven.org/remotecontent?filepath=xerces/xercesImpl/2.2.1/xercesImpl-2.2.1.jar'
-o /root/.maven/repository/xerces/jars/xerces-2.2.1.jar && \
-    \
-    cp /root/.maven/repository/junit/jars/junit-3.8.1.jar /opt/ant/lib/junit-3.8.1.jar
+RUN chmod +x /tmp/install.sh && sh /tmp/install.sh
 
 ENV JAVA_HOME=/usr/java
 ENV PATH=${PATH}:${JAVA_HOME}/bin:/opt/ant/bin

Added: commons/proper/jelly/branches/1.X/docker/answer.txt
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/1.X/docker/answer.txt?rev=1807084&view=auto
==============================================================================
--- commons/proper/jelly/branches/1.X/docker/answer.txt (added)
+++ commons/proper/jelly/branches/1.X/docker/answer.txt Sat Sep  2 19:21:53 2017
@@ -0,0 +1,2 @@
+q
+yes
\ No newline at end of file

Added: commons/proper/jelly/branches/1.X/docker/install.sh
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/1.X/docker/install.sh?rev=1807084&view=auto
==============================================================================
--- commons/proper/jelly/branches/1.X/docker/install.sh (added)
+++ commons/proper/jelly/branches/1.X/docker/install.sh Sat Sep  2 19:21:53 2017
@@ -0,0 +1,47 @@
+#!/bin/bash -x
+
+cd /tmp
+mv something.bin jdk-1_5_0_22-linux-amd64.bin
+chmod a+x jdk-1_5_0_22-linux-amd64.bin
+./jdk-1_5_0_22-linux-amd64.bin < answer.txt
+mv ./jdk1.5.0_22/* /usr/java
+
+mkdir -p /opt/ant
+curl http://archive.apache.org/dist/ant/binaries/apache-ant-1.6.0-bin.tar.gz -o /tmp/apache-ant-1.6.0-bin.tar.gz
+tar -xf apache-ant-1.6.0-bin.tar.gz -C /opt/ant --strip-components 1
+
+mkdir -p /root/commons-jelly-1.X
+
+mkdir -p /root/.maven/repository/servletapi/jars
+mkdir -p /root/.maven/repository/commons-cli/jars
+mkdir -p /root/.maven/repository/commons-lang/jars
+mkdir -p /root/.maven/repository/commons-discovery/jars
+mkdir -p /root/.maven/repository/forehead/jars
+mkdir -p /root/.maven/repository/jstl/jars
+mkdir -p /root/.maven/repository/junit/jars
+mkdir -p /root/.maven/repository/commons-jexl/jars
+mkdir -p /root/.maven/repository/xml-apis/jars
+mkdir -p /root/.maven/repository/commons-beanutils/jars
+mkdir -p /root/.maven/repository/commons-collections/jars
+mkdir -p /root/.maven/repository/commons-logging/jars
+mkdir -p /root/.maven/repository/dom4j/jars
+mkdir -p /root/.maven/repository/jaxen/jars
+mkdir -p /root/.maven/repository/xerces/jars
+
+curl https://search.maven.org/remotecontent?filepath=javax/servlet/servlet-api/2.3/servlet-api-2.3.jar
-o /root/.maven/repository/servletapi/jars/servletapi-2.3.jar
+curl https://search.maven.org/remotecontent?filepath=commons-cli/commons-cli/1.0/commons-cli-1.0.jar
-o /root/.maven/repository/commons-cli/jars/commons-cli-1.0.jar
+curl https://search.maven.org/remotecontent?filepath=commons-lang/commons-lang/2.0/commons-lang-2.0.jar
-o /root/.maven/repository/commons-lang/jars/commons-lang-2.0.jar
+curl https://search.maven.org/remotecontent?filepath=commons-discovery/commons-discovery/20030211.213356/commons-discovery-20030211.213356.jar
-o /root/.maven/repository/commons-discovery/jars/commons-discovery-20030211.213356.jar
+curl https://search.maven.org/remotecontent?filepath=forehead/forehead/1.0-beta-5/forehead-1.0-beta-5.jar
-o /root/.maven/repository/forehead/jars/forehead-1.0-beta-5.jar
+curl https://search.maven.org/remotecontent?filepath=javax/servlet/jstl/1.0.6/jstl-1.0.6.jar
-o /root/.maven/repository/jstl/jars/jstl-1.0.6.jar
+curl https://search.maven.org/remotecontent?filepath=junit/junit/3.8.1/junit-3.8.1.jar -o
/root/.maven/repository/junit/jars/junit-3.8.1.jar
+curl https://search.maven.org/remotecontent?filepath=commons-jexl/commons-jexl/1.0/commons-jexl-1.0.jar
-o /root/.maven/repository/commons-jexl/jars/commons-jexl-1.0.jar
+curl https://search.maven.org/remotecontent?filepath=xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-o /root/.maven/repository/xml-apis/jars/xml-apis-1.0.b2.jar
+curl https://search.maven.org/remotecontent?filepath=commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar
-o /root/.maven/repository/commons-beanutils/jars/commons-beanutils-1.6.jar
+curl https://search.maven.org/remotecontent?filepath=commons-collections/commons-collections/2.1/commons-collections-2.1.jar
-o /root/.maven/repository/commons-collections/jars/commons-collections-2.1.jar
+curl https://search.maven.org/remotecontent?filepath=commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar
-o /root/.maven/repository/commons-logging/jars/commons-logging-1.0.3.jar
+curl https://search.maven.org/remotecontent?filepath=dom4j/dom4j/1.5.2/dom4j-1.5.2.jar -o
/root/.maven/repository/dom4j/jars/dom4j-1.5.2.jar
+curl https://search.maven.org/remotecontent?filepath=jaxen/jaxen/1.1-beta-4/jaxen-1.1-beta-4.jar
-o /root/.maven/repository/jaxen/jars/jaxen-1.1-beta-4.jar
+curl https://search.maven.org/remotecontent?filepath=xerces/xercesImpl/2.2.1/xercesImpl-2.2.1.jar
-o /root/.maven/repository/xerces/jars/xerces-2.2.1.jar
+
+cp /root/.maven/repository/junit/jars/junit-3.8.1.jar /opt/ant/lib/junit-3.8.1.jar
\ No newline at end of file



Mime
View raw message