You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/17 12:44:54 UTC
ignite git commit: # GG-843 Docker image download OpenJDK
Repository: ignite
Updated Branches:
refs/heads/ignite-843 822f7abc7 -> 1040d2650
# GG-843 Docker image download OpenJDK
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1040d265
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1040d265
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1040d265
Branch: refs/heads/ignite-843
Commit: 1040d26505cd1a84f72977d9a7ec738723414bbd
Parents: 822f7ab
Author: Andrey <an...@gridgain.com>
Authored: Thu Sep 17 17:44:25 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Sep 17 17:44:25 2015 +0700
----------------------------------------------------------------------
.../js/routes/generator/generator-docker.js | 24 +++++++-------------
1 file changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1040d265/modules/control-center-web/src/main/js/routes/generator/generator-docker.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-docker.js b/modules/control-center-web/src/main/js/routes/generator/generator-docker.js
index 7c96bcc..4e12b53 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-docker.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-docker.js
@@ -33,22 +33,14 @@ $generatorDocker.clusterDocker = function (cluster, os) {
' maven \\\n' +
' git\n' +
'\n' +
- '# Install Oracle JDK.\n' +
- 'RUN mkdir /opt/jdk\n' +
- '\n' +
- 'RUN wget --header \"Cookie: oraclelicense=accept-securebackup-cookie\" \\\n' +
- ' http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-x64.tar.gz\n' +
- '\n' +
- 'RUN tar -zxf jdk-7u79-linux-x64.tar.gz -C /opt/jdk\n' +
- '\n' +
- 'RUN rm jdk-7u79-linux-x64.tar.gz\n' +
- '\n' +
- 'RUN update-alternatives --install /usr/bin/java java /opt/jdk/jdk1.7.0_79/bin/java 100\n' +
- '\n' +
- 'RUN update-alternatives --install /usr/bin/javac javac /opt/jdk/jdk1.7.0_79/bin/javac 100\n' +
- '\n' +
- '# Sets java variables.\n' +
- 'ENV JAVA_HOME /opt/jdk/jdk1.7.0_79/\n' +
+ '# Install Java. \n' +
+ 'RUN \\\n' +
+ 'apt-get update && \\\n' +
+ 'apt-get install -y openjdk-7-jdk && \\\n' +
+ 'rm -rf /var/lib/apt/lists/*\n' +
+ '\n' +
+ '# Define commonly used JAVA_HOME variable.\n' +
+ 'ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64\n' +
'\n' +
'# Create working directory\n' +
'WORKDIR /home\n' +