From df8cb6723c53daed32b5d76d9790d5573e714d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 8 Mar 2017 11:47:24 +0100
Subject: [PATCH 1/9] [FLINK-6003] Change base docker image from java to
 openjdk

The java image is deprecated from the official docker images since
2016/12.
---
 flink-contrib/docker-flink/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-contrib/docker-flink/Dockerfile b/flink-contrib/docker-flink/Dockerfile
index 133df34625847..01ade59eea945 100644
--- a/flink-contrib/docker-flink/Dockerfile
+++ b/flink-contrib/docker-flink/Dockerfile
@@ -16,7 +16,7 @@
 # limitations under the License.
 ################################################################################
 
-FROM java:8-jre-alpine
+FROM openjdk:8-jre-alpine
 
 # Install requirements
 RUN apk add --no-cache bash snappy

From 84e22af005c343ec74e833e2c1abdc0eb1bb2b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 8 Mar 2017 11:47:24 +0100
Subject: [PATCH 2/9] [FLINK-6003] Trim unneeded files from the official docker
 flink image

---
 flink-contrib/docker-flink/README.md          | 13 ------
 .../docker-flink/bluemix-docker-compose.sh    | 22 ----------
 .../docker-flink/docker-compose-bluemix.yml   | 44 -------------------
 3 files changed, 79 deletions(-)
 delete mode 100755 flink-contrib/docker-flink/bluemix-docker-compose.sh
 delete mode 100644 flink-contrib/docker-flink/docker-compose-bluemix.yml

diff --git a/flink-contrib/docker-flink/README.md b/flink-contrib/docker-flink/README.md
index c7d94bbcfcfee..6ff3aeadd2f05 100644
--- a/flink-contrib/docker-flink/README.md
+++ b/flink-contrib/docker-flink/README.md
@@ -8,19 +8,6 @@ https://docs.docker.com/installation/
 Install the most recent stable version of docker-compose
 https://docs.docker.com/compose/install/
 
-## Bluemix PaaS
-
-If you want to build the image on Bluemix redirect the docker cli to the remote endpoints. There is plenty of documentation how
-to obtain a Bluemix account, so I'm not specifying details. Once you have it and log in using the cloud foundry CLI 'cf' you also
-need the container specific plugin 'ic'. With that you can get the URL to the remote docker host as well as the path to
-the certificates. If you search for "Logging in to the IBM Containers CLI plug-in" you get the details. <br>Here an example:<br>
-export DOCKER_HOST=tcp://containers-api.eu-gb.bluemix.net:8443<br>
-export DOCKER_CERT_PATH=/home/markus/.ice/certs/containers-api.eu-gb.bluemix.net/3c63cb44-86d8-4e89-9a40-f8f3f894a09f<br>
-export DOCKER_TLS_VERIFY=1<br>
-
-Now when proceeding to the next paragraph 'build' the docker commands build and run the image (provided you use ./docker-compose.sh instead of the native docker-compose command.
-Do not forget to allocate and bind a public IP address with the 'cf ic ip' set of commands afterwards.
-
 # Build
 
 Images are based on the official Java Alpine (OpenJDK 8) image. If you want to
diff --git a/flink-contrib/docker-flink/bluemix-docker-compose.sh b/flink-contrib/docker-flink/bluemix-docker-compose.sh
deleted file mode 100755
index 9d090a7987d93..0000000000000
--- a/flink-contrib/docker-flink/bluemix-docker-compose.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-################################################################################
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-export COMPOSE_HTTP_TIMEOUT=120
-export IMAGENAME="registry.eu-gb.bluemix.net/"`cf ic namespace get`"/flink"
-docker-compose  -f docker-compose-bluemix.yml up -d
diff --git a/flink-contrib/docker-flink/docker-compose-bluemix.yml b/flink-contrib/docker-flink/docker-compose-bluemix.yml
deleted file mode 100644
index b667a0d89a46a..0000000000000
--- a/flink-contrib/docker-flink/docker-compose-bluemix.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-################################################################################
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-# image specification requires the full path to your private bluemix image registry
-
-version: "2"
-services:
-  jobmanager:
-    #image example:  registry.eu-gb.bluemix.net/markussaidhiho/flink
-    image: ${IMAGENAME}
-    container_name: "jobmanager"
-    expose:
-      - "6123"
-    ports:
-      - "48081:8081"
-    command: jobmanager
-
-  taskmanager:
-    image: ${IMAGENAME}
-    expose:
-      - "6121"
-      - "6122"
-    depends_on:
-      - jobmanager
-    command: taskmanager
-    links:
-      - "jobmanager:jobmanager"
-    environment:
-      - JOB_MANAGER_RPC_ADDRESS="jobmanager"

From 50975f60e51e8a244ccdc86c076ca0fe4c9874d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 8 Mar 2017 22:09:06 +0100
Subject: [PATCH 3/9] [FLINK-6003] Move Dockerfile into a specific alpine
 directory

---
 flink-contrib/docker-flink/{ => alpine}/Dockerfile           | 0
 flink-contrib/docker-flink/{ => alpine}/docker-entrypoint.sh | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename flink-contrib/docker-flink/{ => alpine}/Dockerfile (100%)
 rename flink-contrib/docker-flink/{ => alpine}/docker-entrypoint.sh (100%)

diff --git a/flink-contrib/docker-flink/Dockerfile b/flink-contrib/docker-flink/alpine/Dockerfile
similarity index 100%
rename from flink-contrib/docker-flink/Dockerfile
rename to flink-contrib/docker-flink/alpine/Dockerfile
diff --git a/flink-contrib/docker-flink/docker-entrypoint.sh b/flink-contrib/docker-flink/alpine/docker-entrypoint.sh
similarity index 100%
rename from flink-contrib/docker-flink/docker-entrypoint.sh
rename to flink-contrib/docker-flink/alpine/docker-entrypoint.sh

From 1457571fc8d30c1c0194798dfb5503803a47b10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 8 Mar 2017 22:13:59 +0100
Subject: [PATCH 4/9] [FLINK-6003] Upgrade default version of the flink image
 to 1.2.0

---
 flink-contrib/docker-flink/alpine/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-contrib/docker-flink/alpine/Dockerfile b/flink-contrib/docker-flink/alpine/Dockerfile
index 01ade59eea945..02f85cd8a83a7 100644
--- a/flink-contrib/docker-flink/alpine/Dockerfile
+++ b/flink-contrib/docker-flink/alpine/Dockerfile
@@ -22,7 +22,7 @@ FROM openjdk:8-jre-alpine
 RUN apk add --no-cache bash snappy
 
 # Configure Flink version
-ARG FLINK_VERSION=1.1.3
+ARG FLINK_VERSION=1.2.0
 ARG HADOOP_VERSION=27
 ARG SCALA_VERSION=2.11
 

From f48882d2e3d0cac072e5cda2f2fec358a28540c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 8 Mar 2017 23:39:39 +0100
Subject: [PATCH 5/9] [FLINK-6003] Refactor alpine Dockerfile

---
 flink-contrib/docker-flink/alpine/Dockerfile | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/flink-contrib/docker-flink/alpine/Dockerfile b/flink-contrib/docker-flink/alpine/Dockerfile
index 02f85cd8a83a7..8de81f3b14a0a 100644
--- a/flink-contrib/docker-flink/alpine/Dockerfile
+++ b/flink-contrib/docker-flink/alpine/Dockerfile
@@ -28,13 +28,13 @@ ARG SCALA_VERSION=2.11
 
 # Flink environment variables
 ENV FLINK_INSTALL_PATH=/opt
-ENV FLINK_HOME $FLINK_INSTALL_PATH/flink
-ENV PATH $PATH:$FLINK_HOME/bin
+ENV FLINK_HOME=$FLINK_INSTALL_PATH/flink
+ENV PATH=$PATH:$FLINK_HOME/bin
+ENV FLINK_USER=flink
+ENV FLINK_UID=9999
 
-# These can be mapped from the host to the container using
-# $ docker run -t flink -p 8081:8081 -p 6123:6123 jobmanager
-EXPOSE 8081
-EXPOSE 6123
+RUN addgroup -S -g $FLINK_UID $FLINK_USER && \
+  adduser -D -S -H -u $FLINK_UID -G $FLINK_USER -h $FLINK_HOME flink
 
 # Install build dependencies and flink
 RUN set -x && \
@@ -43,9 +43,8 @@ RUN set -x && \
   curl -s $(curl -s https://www.apache.org/dyn/closer.cgi\?preferred\=true)flink/flink-${FLINK_VERSION}/flink-${FLINK_VERSION}-bin-hadoop${HADOOP_VERSION}-scala_${SCALA_VERSION}.tgz | \
   tar xvz -C $FLINK_INSTALL_PATH && \
   ln -s $FLINK_INSTALL_PATH/flink-$FLINK_VERSION $FLINK_HOME && \
-  addgroup -S flink && adduser -D -S -H -G flink -h $FLINK_HOME flink && \
-  chown -R flink:flink $FLINK_INSTALL_PATH/flink-$FLINK_VERSION && \
-  chown -h flink:flink $FLINK_HOME && \
+  chown -R $FLINK_USER:$FLINK_USER $FLINK_INSTALL_PATH/flink-$FLINK_VERSION && \
+  chown -h $FLINK_USER:$FLINK_USER $FLINK_HOME && \
   sed -i -e "s/echo \$mypid >> \$pid/echo \$mypid >> \$pid \&\& wait/g" $FLINK_HOME/bin/flink-daemon.sh && \
   apk del build-dependencies && \
   rm -rf /var/cache/apk/*
@@ -54,4 +53,9 @@ RUN set -x && \
 USER flink
 ADD docker-entrypoint.sh $FLINK_HOME/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
+# These can be mapped from the host to the container using
+# $ docker run -t flink -p 8081:8081 -p 6123:6123 jobmanager
+# 6123: jobmanager.rpc.port
+# 8081: jobmanager.web.port
+EXPOSE 6123 8081
 CMD ["sh", "-c"]

From 32727cdef71e62d562486b546e9955b849ff8d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 8 Mar 2017 23:39:59 +0100
Subject: [PATCH 6/9] [FLINK-6003] Clean docker-entrypoint after analysis with
 shellcheck

---
 .../docker-flink/alpine/docker-entrypoint.sh  | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/flink-contrib/docker-flink/alpine/docker-entrypoint.sh b/flink-contrib/docker-flink/alpine/docker-entrypoint.sh
index db567ccce3eb5..c305fec8d41cc 100755
--- a/flink-contrib/docker-flink/alpine/docker-entrypoint.sh
+++ b/flink-contrib/docker-flink/alpine/docker-entrypoint.sh
@@ -18,30 +18,29 @@
 # limitations under the License.
 ################################################################################
 
-### If unspecified, the hostname of the container is taken as the JobManager address
-JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-`hostname -f`}
-###
+# If unspecified, the hostname of the container is taken as the JobManager address
+JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)}
 
-if [ "$1" == "jobmanager" ]; then
+if [ "$1" = "jobmanager" ]; then
     echo "Starting Job Manager"
-    sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address: ${JOB_MANAGER_RPC_ADDRESS}/g" $FLINK_HOME/conf/flink-conf.yaml
+    sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address: ${JOB_MANAGER_RPC_ADDRESS}/g" "$FLINK_HOME/conf/flink-conf.yaml"
 
-    echo "config file: " && grep '^[^\n#]' $FLINK_HOME/conf/flink-conf.yaml
-    $FLINK_HOME/bin/jobmanager.sh start cluster
+    echo "config file: " && grep '^[^\n#]' "$FLINK_HOME/conf/flink-conf.yaml"
+    "$FLINK_HOME/bin/jobmanager.sh" start cluster
 
-  # prevent script to exit
-  tail -f /dev/null
-elif [ "$1" == "taskmanager" ]; then
-
-    sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address: ${JOB_MANAGER_RPC_ADDRESS}/g" $FLINK_HOME/conf/flink-conf.yaml
-    sed -i -e "s/taskmanager.numberOfTaskSlots: 1/taskmanager.numberOfTaskSlots: `grep -c ^processor /proc/cpuinfo`/g" $FLINK_HOME/conf/flink-conf.yaml
+elif [ "$1" = "taskmanager" ]; then
+    sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address: ${JOB_MANAGER_RPC_ADDRESS}/g" "$FLINK_HOME/conf/flink-conf.yaml"
+    sed -i -e "s/taskmanager.numberOfTaskSlots: 1/taskmanager.numberOfTaskSlots: $(grep -c ^processor /proc/cpuinfo)/g" "$FLINK_HOME/conf/flink-conf.yaml"
 
     echo "Starting Task Manager"
-    echo "config file: " && grep '^[^\n#]' $FLINK_HOME/conf/flink-conf.yaml
-    $FLINK_HOME/bin/taskmanager.sh start
-
-  # prevent script to exit
-  tail -f /dev/null
+    echo "config file: " && grep '^[^\n#]' "$FLINK_HOME/conf/flink-conf.yaml"
+    "$FLINK_HOME/bin/taskmanager.sh" start
+
+    # prevent script to exit
+    tail -f /dev/null
+elif [ "$1" = "local" ]; then
+    echo "Starting local cluster"
+    "$FLINK_HOME/bin/start-local.sh"
 else
-    $@
+    "$@"
 fi

From 7e40f28ea0937bbad9f10e84074931b36197537d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Thu, 9 Mar 2017 14:50:48 +0100
Subject: [PATCH 7/9] [FLINK-6003] Add dockerfile for pure openjdk
 (debian-based)

---
 flink-contrib/docker-flink/Dockerfile         | 60 +++++++++++++++++++
 .../docker-flink/docker-entrypoint.sh         | 46 ++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 flink-contrib/docker-flink/Dockerfile
 create mode 100755 flink-contrib/docker-flink/docker-entrypoint.sh

diff --git a/flink-contrib/docker-flink/Dockerfile b/flink-contrib/docker-flink/Dockerfile
new file mode 100644
index 0000000000000..8c1c0a486bcdb
--- /dev/null
+++ b/flink-contrib/docker-flink/Dockerfile
@@ -0,0 +1,60 @@
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+FROM openjdk:8-jre
+
+# Install requirements
+RUN apt-get update && \
+  apt-get -y install libsnappy1 && \
+  rm -rf /var/lib/apt/lists/*
+
+# Configure Flink version
+ARG FLINK_VERSION=1.2.0
+ARG HADOOP_VERSION=27
+ARG SCALA_VERSION=2.11
+
+# Flink environment variables
+ENV FLINK_INSTALL_PATH=/opt
+ENV FLINK_HOME=$FLINK_INSTALL_PATH/flink
+ENV PATH=$PATH:$FLINK_HOME/bin
+ENV FLINK_USER=flink
+ENV FLINK_UID=9999
+
+RUN groupadd --system --gid=$FLINK_UID $FLINK_USER && \
+  useradd --system --uid=$FLINK_UID --gid $FLINK_USER $FLINK_USER
+
+# Install build dependencies and flink
+RUN set -x && \
+  mkdir -p $FLINK_INSTALL_PATH && \
+  curl -s $(curl -s https://www.apache.org/dyn/closer.cgi\?preferred\=true)flink/flink-${FLINK_VERSION}/flink-${FLINK_VERSION}-bin-hadoop${HADOOP_VERSION}-scala_${SCALA_VERSION}.tgz | \
+  tar xvz -C $FLINK_INSTALL_PATH && \
+  ln -s $FLINK_INSTALL_PATH/flink-$FLINK_VERSION $FLINK_HOME && \
+  chown -R $FLINK_USER:$FLINK_USER $FLINK_INSTALL_PATH/flink-$FLINK_VERSION && \
+  chown -h $FLINK_USER:$FLINK_USER $FLINK_HOME && \
+  sed -i -e "s/echo \$mypid >> \$pid/echo \$mypid >> \$pid \&\& wait/g" $FLINK_HOME/bin/flink-daemon.sh
+
+# Configure container
+USER flink
+ADD docker-entrypoint.sh $FLINK_HOME/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+# These can be mapped from the host to the container using
+# $ docker run -t flink -p 8081:8081 -p 6123:6123 jobmanager
+# 6123: jobmanager.rpc.port
+# 8081: jobmanager.web.port
+EXPOSE 6123 8081
+CMD ["sh", "-c"]
diff --git a/flink-contrib/docker-flink/docker-entrypoint.sh b/flink-contrib/docker-flink/docker-entrypoint.sh
new file mode 100755
index 0000000000000..c305fec8d41cc
--- /dev/null
+++ b/flink-contrib/docker-flink/docker-entrypoint.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# If unspecified, the hostname of the container is taken as the JobManager address
+JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)}
+
+if [ "$1" = "jobmanager" ]; then
+    echo "Starting Job Manager"
+    sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address: ${JOB_MANAGER_RPC_ADDRESS}/g" "$FLINK_HOME/conf/flink-conf.yaml"
+
+    echo "config file: " && grep '^[^\n#]' "$FLINK_HOME/conf/flink-conf.yaml"
+    "$FLINK_HOME/bin/jobmanager.sh" start cluster
+
+elif [ "$1" = "taskmanager" ]; then
+    sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address: ${JOB_MANAGER_RPC_ADDRESS}/g" "$FLINK_HOME/conf/flink-conf.yaml"
+    sed -i -e "s/taskmanager.numberOfTaskSlots: 1/taskmanager.numberOfTaskSlots: $(grep -c ^processor /proc/cpuinfo)/g" "$FLINK_HOME/conf/flink-conf.yaml"
+
+    echo "Starting Task Manager"
+    echo "config file: " && grep '^[^\n#]' "$FLINK_HOME/conf/flink-conf.yaml"
+    "$FLINK_HOME/bin/taskmanager.sh" start
+
+    # prevent script to exit
+    tail -f /dev/null
+elif [ "$1" = "local" ]; then
+    echo "Starting local cluster"
+    "$FLINK_HOME/bin/start-local.sh"
+else
+    "$@"
+fi

From f4386a277529f23751d05cce2f99eb89a2319355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Thu, 9 Mar 2017 14:51:55 +0100
Subject: [PATCH 8/9] [FLINK-6003] Update docker README

---
 flink-contrib/docker-flink/README.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/flink-contrib/docker-flink/README.md b/flink-contrib/docker-flink/README.md
index 6ff3aeadd2f05..519e0ad405aae 100644
--- a/flink-contrib/docker-flink/README.md
+++ b/flink-contrib/docker-flink/README.md
@@ -10,7 +10,7 @@ https://docs.docker.com/compose/install/
 
 # Build
 
-Images are based on the official Java Alpine (OpenJDK 8) image. If you want to
+Images are based on the official OpenJDK JRE 8 image. If you want to
 build the flink image run:
 
     sh build.sh
@@ -22,7 +22,13 @@ or
 If you want to build the container for a specific version of flink/hadoop/scala
 you can configure it in the respective args:
 
-    docker build --build-arg FLINK_VERSION=1.0.3 --build-arg HADOOP_VERSION=26 --build-arg SCALA_VERSION=2.10 -t "flink:1.0.3-hadoop2.6-scala_2.10" flink
+    docker build --build-arg FLINK_VERSION=1.2.0 --build-arg HADOOP_VERSION=26 --build-arg SCALA_VERSION=2.10 -t "flink:1.0.3-hadoop2.6-scala_2.10" flink
+
+## Alpine version
+
+There is also a smaller version of the image based on the OpenJDK JRE 8 alpine image. To build the alpine version you should go into the alpine directory and run:
+
+    docker build -t flink .
 
 # Deploy
 
@@ -40,7 +46,7 @@ you can configure it in the respective args:
 
 - Access the Job Manager container
 
-        docker exec -it $(docker ps --filter name=flink_jobmanager --format={{.ID}}) /bin/sh
+        docker exec -it $(docker ps --filter name=jobmanager --format={{.ID}}) /bin/sh
 
 - Kill the cluster
 
@@ -48,7 +54,7 @@ you can configure it in the respective args:
 
 - Upload jar to the cluster
 
-        docker cp <your_jar> $(docker ps --filter name=flink_jobmanager --format={{.ID}}):/<your_path>
+        docker cp <your_jar> $(docker ps --filter name=jobmanager --format={{.ID}}):/<your_path>
 
 - Copy file to all the nodes in the cluster
 
@@ -60,7 +66,7 @@ you can configure it in the respective args:
 
 From the jobmanager:
 
-        docker exec -it $(docker ps --filter name=flink_jobmanager --format={{.ID}}) flink run -m <jobmanager:port> -c <your_class> <your_jar> <your_params>
+        docker exec -it $(docker ps --filter name=jobmanager --format={{.ID}}) flink run -m <jobmanager:port> -c <your_class> <your_jar> <your_params>
 
 If you have a local flink installation:
 
@@ -72,7 +78,7 @@ or
 
 ### Ports
 
-- The Web Client is on port `48081`
+- The Web Client is on port `8081`
 - JobManager RPC port `6123` (default, not exposed to host)
 - TaskManagers RPC port `6122` (default, not exposed to host)
 - TaskManagers Data port `6121` (default, not exposed to host)

From 08d5ce4664a20d227368573a5a688bfef4de466e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Thu, 9 Mar 2017 14:55:48 +0100
Subject: [PATCH 9/9] [FLINK-6003] Remove quotes that broke host resolution on
 docker-compose

---
 flink-contrib/docker-flink/docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flink-contrib/docker-flink/docker-compose.yml b/flink-contrib/docker-flink/docker-compose.yml
index 6a1335360d604..0dd7d0fe3e177 100644
--- a/flink-contrib/docker-flink/docker-compose.yml
+++ b/flink-contrib/docker-flink/docker-compose.yml
@@ -20,14 +20,14 @@ version: "2"
 services:
   jobmanager:
     image: flink
-    container_name: "jobmanager"
+    container_name: jobmanager
     expose:
       - "6123"
     ports:
-      - "48081:8081"
+      - "8081:8081"
     command: jobmanager
     environment:
-      - JOB_MANAGER_RPC_ADDRESS="jobmanager"
+      - JOB_MANAGER_RPC_ADDRESS=jobmanager
 
   taskmanager:
     image: flink
@@ -40,4 +40,4 @@ services:
     links:
       - "jobmanager:jobmanager"
     environment:
-      - JOB_MANAGER_RPC_ADDRESS="jobmanager"
+      - JOB_MANAGER_RPC_ADDRESS=jobmanager