flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject flink git commit: [FLINK-3155] Update Flink Dockerfile
Date Tue, 10 May 2016 10:30:27 GMT
Repository: flink
Updated Branches:
  refs/heads/master 9fccd6e5d -> 05c765e57


[FLINK-3155] Update Flink Dockerfile

* ubuntu trusty->xenial
* jdk 7u51 -> 8u91
* flink 0.10.1 -> 1.0.2

This closes #1969


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/05c765e5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/05c765e5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/05c765e5

Branch: refs/heads/master
Commit: 05c765e5795fb3004fa5b8dbe089701ebc69126a
Parents: 9fccd6e
Author: Tony Baines <tony.baines.1@gmail.com>
Authored: Sat May 7 14:57:15 2016 +0100
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue May 10 12:29:54 2016 +0200

----------------------------------------------------------------------
 flink-contrib/docker-flink/base/Dockerfile  | 6 +++---
 flink-contrib/docker-flink/flink/Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/05c765e5/flink-contrib/docker-flink/base/Dockerfile
----------------------------------------------------------------------
diff --git a/flink-contrib/docker-flink/base/Dockerfile b/flink-contrib/docker-flink/base/Dockerfile
index 67a2953..2d0704d 100644
--- a/flink-contrib/docker-flink/base/Dockerfile
+++ b/flink-contrib/docker-flink/base/Dockerfile
@@ -16,7 +16,7 @@
 # limitations under the License.
 ################################################################################
 
-FROM ubuntu:trusty
+FROM ubuntu:xenial
 
 #requirements
 RUN apt-get update; apt-get install -y curl wget supervisor openssh-server openssh-client
nano
@@ -24,9 +24,9 @@ RUN apt-get update; apt-get install -y curl wget supervisor openssh-server
opens
 #priviledge separation directory
 RUN mkdir /var/run/sshd
 
-#install Java 7 Oracle JDK
+#install Java 8 Oracle JDK
 RUN mkdir -p /usr/java/default && \
-    curl -Ls 'http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-linux-x64.tar.gz'
-H 'Cookie: oraclelicense=accept-securebackup-cookie' | \
+    curl -Ls 'http://download.oracle.com/otn-pub/java/jdk/8u91-b14/jdk-8u91-linux-x64.tar.gz'
-H 'Cookie: oraclelicense=accept-securebackup-cookie' | \
     tar --strip-components=1 -xz -C /usr/java/default/
 ENV JAVA_HOME /usr/java/default/
 

http://git-wip-us.apache.org/repos/asf/flink/blob/05c765e5/flink-contrib/docker-flink/flink/Dockerfile
----------------------------------------------------------------------
diff --git a/flink-contrib/docker-flink/flink/Dockerfile b/flink-contrib/docker-flink/flink/Dockerfile
index b12ab66..0e39027 100644
--- a/flink-contrib/docker-flink/flink/Dockerfile
+++ b/flink-contrib/docker-flink/flink/Dockerfile
@@ -22,11 +22,11 @@ FROM base
 RUN ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ''
 RUN cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/*
 
-##Flink 0.10.0 Installation
+##Flink 1.0.2 Installation
 ###Download:
 RUN mkdir ~/downloads && cd ~/downloads && \
-    wget -q -O - http://mirror.switch.ch/mirror/apache/dist/flink/flink-0.10.1/flink-0.10.1-bin-hadoop27-scala_2.11.tgz|
tar -zxvf - -C /usr/local/
-RUN cd /usr/local && ln -s ./flink-0.10.1 flink
+    wget -q -O - http://mirror.switch.ch/mirror/apache/dist/flink/flink-1.0.2/flink-1.0.2-bin-hadoop27-scala_2.11.tgz|
tar -zxvf - -C /usr/local/
+RUN cd /usr/local && ln -s ./flink-1.0.2 flink
 
 ENV FLINK_HOME /usr/local/flink
 ENV PATH $PATH:$FLINK_HOME/bin


Mime
View raw message