[Mobies-commit] [commit] r4371 - in UDM/trunk/debian/docker: UDM_12.04 UDM_12.04_x86 UDM_14.04 UDM_14.04_x86
lattmann at redhat3.isis.vanderbilt.edu
lattmann at redhat3.isis.vanderbilt.edu
Thu Dec 3 14:56:22 CST 2015
Author: lattmann
Date: Thu Dec 3 14:56:22 2015
New Revision: 4371
Log:
Update java 6 to java 7 for docker images.
Modified:
UDM/trunk/debian/docker/UDM_12.04/Dockerfile
UDM/trunk/debian/docker/UDM_12.04_x86/Dockerfile
UDM/trunk/debian/docker/UDM_14.04/Dockerfile
UDM/trunk/debian/docker/UDM_14.04_x86/Dockerfile
Modified: UDM/trunk/debian/docker/UDM_12.04/Dockerfile
==============================================================================
--- UDM/trunk/debian/docker/UDM_12.04/Dockerfile Thu Nov 12 18:05:51 2015 (r4370)
+++ UDM/trunk/debian/docker/UDM_12.04/Dockerfile Thu Dec 3 14:56:22 2015 (r4371)
@@ -5,12 +5,12 @@
RUN adduser --disabled-password --home=/jenkins --gecos "" jenkins
WORKDIR /jenkins
-RUN apt-get update && apt-get install -y fakeroot debhelper build-essential autoconf libtool libxerces-c2-dev autotools-dev ccache libcppunit-dev libxalan110-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-6-jdk libboost-python-dev libjson-spirit-dev
+RUN apt-get update && apt-get install -y fakeroot debhelper build-essential autoconf libtool libxerces-c2-dev autotools-dev ccache libcppunit-dev libxalan110-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-7-jdk libboost-python-dev libjson-spirit-dev
RUN apt-get update && apt-get install -y curl wget unzip
RUN curl -o /jenkins/slave.jar -f -s -S http://build.isis.vanderbilt.edu/jnlpJars/slave.jar
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64/
+ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64/
USER jenkins
CMD ["java", "-jar", "slave.jar", "-jnlpUrl", "http://build.isis.vanderbilt.edu/computer/UDM_ubuntu12.04/slave-agent.jnlp"]
Modified: UDM/trunk/debian/docker/UDM_12.04_x86/Dockerfile
==============================================================================
--- UDM/trunk/debian/docker/UDM_12.04_x86/Dockerfile Thu Nov 12 18:05:51 2015 (r4370)
+++ UDM/trunk/debian/docker/UDM_12.04_x86/Dockerfile Thu Dec 3 14:56:22 2015 (r4371)
@@ -5,12 +5,12 @@
RUN adduser --disabled-password --home=/jenkins --gecos "" jenkins
WORKDIR /jenkins
-RUN apt-get update && apt-get install -y fakeroot debhelper build-essential autoconf libtool libxerces-c2-dev autotools-dev ccache libcppunit-dev libxalan110-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-6-jdk libboost-python-dev libjson-spirit-dev
+RUN apt-get update && apt-get install -y fakeroot debhelper build-essential autoconf libtool libxerces-c2-dev autotools-dev ccache libcppunit-dev libxalan110-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-7-jdk libboost-python-dev libjson-spirit-dev
RUN apt-get update && apt-get install -y curl wget unzip
RUN curl -o /jenkins/slave.jar -f -s -S http://build.isis.vanderbilt.edu/jnlpJars/slave.jar
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-i386/
+ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-i386/
USER jenkins
CMD ["java", "-jar", "slave.jar", "-jnlpUrl", "http://build.isis.vanderbilt.edu/computer/UDM_ubuntu12.04_x86/slave-agent.jnlp"]
Modified: UDM/trunk/debian/docker/UDM_14.04/Dockerfile
==============================================================================
--- UDM/trunk/debian/docker/UDM_14.04/Dockerfile Thu Nov 12 18:05:51 2015 (r4370)
+++ UDM/trunk/debian/docker/UDM_14.04/Dockerfile Thu Dec 3 14:56:22 2015 (r4371)
@@ -5,12 +5,12 @@
RUN adduser --disabled-password --home=/jenkins --gecos "" jenkins
WORKDIR /jenkins
-RUN apt-get update && sudo apt-get install -y libjson-spirit-dev wget unzip fakeroot debhelper build-essential autoconf libtool libxalan-c-dev libxerces-c-dev autotools-dev ccache libcppunit-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-6-jdk libboost-python-dev
+RUN apt-get update && sudo apt-get install -y libjson-spirit-dev wget unzip fakeroot debhelper build-essential autoconf libtool libxalan-c-dev libxerces-c-dev autotools-dev ccache libcppunit-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-7-jdk libboost-python-dev
RUN apt-get update && sudo apt-get install -y curl
RUN curl -o /jenkins/slave.jar -f -s -S http://build.isis.vanderbilt.edu/jnlpJars/slave.jar
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64/
+ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64/
USER jenkins
CMD ["java", "-jar", "slave.jar", "-jnlpUrl", "http://build.isis.vanderbilt.edu/computer/UDM_ubuntu14.04/slave-agent.jnlp"]
Modified: UDM/trunk/debian/docker/UDM_14.04_x86/Dockerfile
==============================================================================
--- UDM/trunk/debian/docker/UDM_14.04_x86/Dockerfile Thu Nov 12 18:05:51 2015 (r4370)
+++ UDM/trunk/debian/docker/UDM_14.04_x86/Dockerfile Thu Dec 3 14:56:22 2015 (r4371)
@@ -5,12 +5,12 @@
RUN adduser --disabled-password --home=/jenkins --gecos "" jenkins
WORKDIR /jenkins
-RUN apt-get update && apt-get install -y libjson-spirit-dev wget unzip fakeroot debhelper build-essential autoconf libtool libxalan-c-dev libxerces-c-dev autotools-dev ccache libcppunit-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-6-jdk libboost-python-dev
+RUN apt-get update && apt-get install -y libjson-spirit-dev wget unzip fakeroot debhelper build-essential autoconf libtool libxalan-c-dev libxerces-c-dev autotools-dev ccache libcppunit-dev ant junit ant-optional pccts libboost-dev zlib1g-dev swig openjdk-7-jdk libboost-python-dev
RUN apt-get update && apt-get install -y curl
RUN curl -o /jenkins/slave.jar -f -s -S http://build.isis.vanderbilt.edu/jnlpJars/slave.jar
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-i386/
+ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-i386/
USER jenkins
CMD ["java", "-jar", "slave.jar", "-jnlpUrl", "http://build.isis.vanderbilt.edu/computer/UDM_ubuntu14.04_x86/slave-agent.jnlp"]
More information about the Mobies-commit
mailing list