Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 69F032007D0 for ; Tue, 10 May 2016 12:30:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 687D3160877; Tue, 10 May 2016 10:30:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B1B1C1607AA for ; Tue, 10 May 2016 12:30:28 +0200 (CEST) Received: (qmail 99832 invoked by uid 500); 10 May 2016 10:30:28 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 99823 invoked by uid 99); 10 May 2016 10:30:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2016 10:30:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AD363DFDE3; Tue, 10 May 2016 10:30:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mxm@apache.org To: commits@flink.apache.org Message-Id: <7d3165a3b6474d418d633dd1c34f9ce0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [FLINK-3155] Update Flink Dockerfile Date: Tue, 10 May 2016 10:30:27 +0000 (UTC) archived-at: Tue, 10 May 2016 10:30:29 -0000 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 Authored: Sat May 7 14:57:15 2016 +0100 Committer: Maximilian Michels 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