Repository: flink Updated Branches: refs/heads/master 59b3be0ec -> 8b1b4a1cc
[docker] improve Dockerfile - Make build.sh executable - Fix Dockerfile using ARG instead of ENV - Prevent exit only for job-/taskmanger shortcuts This closes #3086. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8b1b4a1c Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8b1b4a1c Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8b1b4a1c Branch: refs/heads/master Commit: 8b1b4a1ccee82a014377ebf7813fae63b75d70be Parents: 59b3be0 Author: Stephan Epping <[email protected]> Authored: Tue Jan 10 12:11:27 2017 +0100 Committer: Maximilian Michels <[email protected]> Committed: Fri Jan 13 19:15:14 2017 +0100 ---------------------------------------------------------------------- flink-contrib/docker-flink/Dockerfile | 6 +++--- flink-contrib/docker-flink/build.sh | 0 flink-contrib/docker-flink/docker-entrypoint.sh | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/8b1b4a1c/flink-contrib/docker-flink/Dockerfile ---------------------------------------------------------------------- diff --git a/flink-contrib/docker-flink/Dockerfile b/flink-contrib/docker-flink/Dockerfile index ce5271dc..133df34 100644 --- a/flink-contrib/docker-flink/Dockerfile +++ b/flink-contrib/docker-flink/Dockerfile @@ -22,9 +22,9 @@ FROM java:8-jre-alpine RUN apk add --no-cache bash snappy # Configure Flink version -ENV FLINK_VERSION=1.1.1 -ENV HADOOP_VERSION=27 -ENV SCALA_VERSION=2.11 +ARG FLINK_VERSION=1.1.3 +ARG HADOOP_VERSION=27 +ARG SCALA_VERSION=2.11 # Flink environment variables ENV FLINK_INSTALL_PATH=/opt http://git-wip-us.apache.org/repos/asf/flink/blob/8b1b4a1c/flink-contrib/docker-flink/build.sh ---------------------------------------------------------------------- diff --git a/flink-contrib/docker-flink/build.sh b/flink-contrib/docker-flink/build.sh old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/flink/blob/8b1b4a1c/flink-contrib/docker-flink/docker-entrypoint.sh ---------------------------------------------------------------------- diff --git a/flink-contrib/docker-flink/docker-entrypoint.sh b/flink-contrib/docker-flink/docker-entrypoint.sh index 780ce38..db567cc 100755 --- a/flink-contrib/docker-flink/docker-entrypoint.sh +++ b/flink-contrib/docker-flink/docker-entrypoint.sh @@ -28,6 +28,9 @@ if [ "$1" == "jobmanager" ]; then 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 @@ -36,9 +39,9 @@ elif [ "$1" == "taskmanager" ]; then 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 else $@ fi - -# prevent script to exit -tail -f /dev/null
