This is an automated email from the ASF dual-hosted git repository. dwysakowicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-docker.git
The following commit(s) were added to refs/heads/master by this push: new e2d7fda Update Dockerfiles for 1.14.0 release e2d7fda is described below commit e2d7fda603c61359c625189debb22a30e8aeb84f Author: Dawid Wysakowicz <dwysakow...@apache.org> AuthorDate: Wed Sep 29 09:50:23 2021 +0200 Update Dockerfiles for 1.14.0 release --- 1.11/scala_2.11-java11-debian/Dockerfile | 87 -------------- 1.11/scala_2.11-java11-debian/docker-entrypoint.sh | 125 --------------------- 1.11/scala_2.11-java11-debian/release.metadata | 2 - 1.11/scala_2.11-java8-debian/Dockerfile | 87 -------------- 1.11/scala_2.11-java8-debian/docker-entrypoint.sh | 125 --------------------- 1.11/scala_2.11-java8-debian/release.metadata | 2 - 1.11/scala_2.12-java11-debian/Dockerfile | 87 -------------- 1.11/scala_2.12-java11-debian/docker-entrypoint.sh | 125 --------------------- 1.11/scala_2.12-java11-debian/release.metadata | 2 - 1.11/scala_2.12-java8-debian/Dockerfile | 87 -------------- 1.11/scala_2.12-java8-debian/docker-entrypoint.sh | 125 --------------------- 1.11/scala_2.12-java8-debian/release.metadata | 2 - 1.12/scala_2.11-java11-debian/release.metadata | 2 - 1.12/scala_2.11-java8-debian/release.metadata | 2 - 1.12/scala_2.12-java11-debian/release.metadata | 2 - 1.12/scala_2.12-java8-debian/release.metadata | 2 - .../scala_2.11-java11-debian}/Dockerfile | 6 +- .../scala_2.11-java11-debian/docker-entrypoint.sh | 21 +--- 1.14/scala_2.11-java11-debian/release.metadata | 2 + {1.12 => 1.14}/scala_2.11-java8-debian/Dockerfile | 6 +- .../scala_2.11-java8-debian/docker-entrypoint.sh | 21 +--- 1.14/scala_2.11-java8-debian/release.metadata | 2 + .../scala_2.12-java11-debian}/Dockerfile | 6 +- .../scala_2.12-java11-debian/docker-entrypoint.sh | 21 +--- 1.14/scala_2.12-java11-debian/release.metadata | 2 + {1.12 => 1.14}/scala_2.12-java8-debian/Dockerfile | 6 +- .../scala_2.12-java8-debian/docker-entrypoint.sh | 21 +--- 1.14/scala_2.12-java8-debian/release.metadata | 2 + 28 files changed, 32 insertions(+), 948 deletions(-) diff --git a/1.11/scala_2.11-java11-debian/Dockerfile b/1.11/scala_2.11-java11-debian/Dockerfile deleted file mode 100644 index 5f27f6a..0000000 --- a/1.11/scala_2.11-java11-debian/Dockerfile +++ /dev/null @@ -1,87 +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. -############################################################################### - -FROM openjdk:11-jre - -# Install dependencies -RUN set -ex; \ - apt-get update; \ - apt-get -y install libsnappy1v5 gettext-base; \ - rm -rf /var/lib/apt/lists/* - -# Grab gosu for easy step-down from root -ENV GOSU_VERSION 1.11 -RUN set -ex; \ - wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)"; \ - wget -nv -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ - done && \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - chmod +x /usr/local/bin/gosu; \ - gosu nobody true - -# Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.11.4/flink-1.11.4-bin-scala_2.11.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.11.4/flink-1.11.4-bin-scala_2.11.tgz.asc \ - GPG_KEY=4A978875E56AA2100EB0CF12A244D52CF0A40279 \ - CHECK_GPG=true - -# Prepare environment -ENV FLINK_HOME=/opt/flink -ENV PATH=$FLINK_HOME/bin:$PATH -RUN groupadd --system --gid=9999 flink && \ - useradd --system --home-dir $FLINK_HOME --uid=9999 --gid=flink flink -WORKDIR $FLINK_HOME - -# Install Flink -RUN set -ex; \ - wget -nv -O flink.tgz "$FLINK_TGZ_URL"; \ - \ - if [ "$CHECK_GPG" = "true" ]; then \ - wget -nv -O flink.tgz.asc "$FLINK_ASC_URL"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys "$GPG_KEY" && break || : ; \ - done && \ - gpg --batch --verify flink.tgz.asc flink.tgz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" flink.tgz.asc; \ - fi; \ - \ - tar -xf flink.tgz --strip-components=1; \ - rm flink.tgz; \ - \ - chown -R flink:flink .; - -# Configure container -COPY docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] -EXPOSE 6123 8081 -CMD ["help"] diff --git a/1.11/scala_2.11-java11-debian/docker-entrypoint.sh b/1.11/scala_2.11-java11-debian/docker-entrypoint.sh deleted file mode 100755 index 6084f06..0000000 --- a/1.11/scala_2.11-java11-debian/docker-entrypoint.sh +++ /dev/null @@ -1,125 +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. -############################################################################### - -COMMAND_STANDALONE="standalone-job" - -# If unspecified, the hostname of the container is taken as the JobManager address -JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)} -CONF_FILE="${FLINK_HOME}/conf/flink-conf.yaml" - -drop_privs_cmd() { - if [ $(id -u) != 0 ]; then - # Don't need to drop privs if EUID != 0 - return - elif [ -x /sbin/su-exec ]; then - # Alpine - echo su-exec flink - else - # Others - echo gosu flink - fi -} - -copy_plugins_if_required() { - if [ -z "$ENABLE_BUILT_IN_PLUGINS" ]; then - return 0 - fi - - echo "Enabling required built-in plugins" - for target_plugin in $(echo "$ENABLE_BUILT_IN_PLUGINS" | tr ';' ' '); do - echo "Linking ${target_plugin} to plugin directory" - plugin_name=${target_plugin%.jar} - - mkdir -p "${FLINK_HOME}/plugins/${plugin_name}" - if [ ! -e "${FLINK_HOME}/opt/${target_plugin}" ]; then - echo "Plugin ${target_plugin} does not exist. Exiting." - exit 1 - else - ln -fs "${FLINK_HOME}/opt/${target_plugin}" "${FLINK_HOME}/plugins/${plugin_name}" - echo "Successfully enabled ${target_plugin}" - fi - done -} - -set_config_option() { - local option=$1 - local value=$2 - - # escape periods for usage in regular expressions - local escaped_option=$(echo ${option} | sed -e "s/\./\\\./g") - - # either override an existing entry, or append a new one - if grep -E "^${escaped_option}:.*" "${CONF_FILE}" > /dev/null; then - sed -i -e "s/${escaped_option}:.*/$option: $value/g" "${CONF_FILE}" - else - echo "${option}: ${value}" >> "${CONF_FILE}" - fi -} - -set_common_options() { - set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS} - set_config_option blob.server.port 6124 - set_config_option query.server.port 6125 -} - -prepare_job_manager_start() { - echo "Starting Job Manager" - copy_plugins_if_required - - set_common_options - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" -} - -if [ "$1" = "help" ]; then - echo "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|help)" - exit 0 -elif [ "$1" = "jobmanager" ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@" -elif [ "$1" = ${COMMAND_STANDALONE} ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "$@" -elif [ "$1" = "taskmanager" ]; then - shift 1 - echo "Starting Task Manager" - copy_plugins_if_required - - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)} - - set_common_options - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@" -fi - -exec "$@" diff --git a/1.11/scala_2.11-java11-debian/release.metadata b/1.11/scala_2.11-java11-debian/release.metadata deleted file mode 100644 index 9fe9d15..0000000 --- a/1.11/scala_2.11-java11-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.11.4-scala_2.11-java11, 1.11-scala_2.11-java11, scala_2.11-java11 -Architectures: amd64 diff --git a/1.11/scala_2.11-java8-debian/Dockerfile b/1.11/scala_2.11-java8-debian/Dockerfile deleted file mode 100644 index 1dbcb6c..0000000 --- a/1.11/scala_2.11-java8-debian/Dockerfile +++ /dev/null @@ -1,87 +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. -############################################################################### - -FROM openjdk:8-jre - -# Install dependencies -RUN set -ex; \ - apt-get update; \ - apt-get -y install libsnappy1v5 gettext-base; \ - rm -rf /var/lib/apt/lists/* - -# Grab gosu for easy step-down from root -ENV GOSU_VERSION 1.11 -RUN set -ex; \ - wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)"; \ - wget -nv -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ - done && \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - chmod +x /usr/local/bin/gosu; \ - gosu nobody true - -# Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.11.4/flink-1.11.4-bin-scala_2.11.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.11.4/flink-1.11.4-bin-scala_2.11.tgz.asc \ - GPG_KEY=4A978875E56AA2100EB0CF12A244D52CF0A40279 \ - CHECK_GPG=true - -# Prepare environment -ENV FLINK_HOME=/opt/flink -ENV PATH=$FLINK_HOME/bin:$PATH -RUN groupadd --system --gid=9999 flink && \ - useradd --system --home-dir $FLINK_HOME --uid=9999 --gid=flink flink -WORKDIR $FLINK_HOME - -# Install Flink -RUN set -ex; \ - wget -nv -O flink.tgz "$FLINK_TGZ_URL"; \ - \ - if [ "$CHECK_GPG" = "true" ]; then \ - wget -nv -O flink.tgz.asc "$FLINK_ASC_URL"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys "$GPG_KEY" && break || : ; \ - done && \ - gpg --batch --verify flink.tgz.asc flink.tgz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" flink.tgz.asc; \ - fi; \ - \ - tar -xf flink.tgz --strip-components=1; \ - rm flink.tgz; \ - \ - chown -R flink:flink .; - -# Configure container -COPY docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] -EXPOSE 6123 8081 -CMD ["help"] diff --git a/1.11/scala_2.11-java8-debian/docker-entrypoint.sh b/1.11/scala_2.11-java8-debian/docker-entrypoint.sh deleted file mode 100755 index 6084f06..0000000 --- a/1.11/scala_2.11-java8-debian/docker-entrypoint.sh +++ /dev/null @@ -1,125 +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. -############################################################################### - -COMMAND_STANDALONE="standalone-job" - -# If unspecified, the hostname of the container is taken as the JobManager address -JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)} -CONF_FILE="${FLINK_HOME}/conf/flink-conf.yaml" - -drop_privs_cmd() { - if [ $(id -u) != 0 ]; then - # Don't need to drop privs if EUID != 0 - return - elif [ -x /sbin/su-exec ]; then - # Alpine - echo su-exec flink - else - # Others - echo gosu flink - fi -} - -copy_plugins_if_required() { - if [ -z "$ENABLE_BUILT_IN_PLUGINS" ]; then - return 0 - fi - - echo "Enabling required built-in plugins" - for target_plugin in $(echo "$ENABLE_BUILT_IN_PLUGINS" | tr ';' ' '); do - echo "Linking ${target_plugin} to plugin directory" - plugin_name=${target_plugin%.jar} - - mkdir -p "${FLINK_HOME}/plugins/${plugin_name}" - if [ ! -e "${FLINK_HOME}/opt/${target_plugin}" ]; then - echo "Plugin ${target_plugin} does not exist. Exiting." - exit 1 - else - ln -fs "${FLINK_HOME}/opt/${target_plugin}" "${FLINK_HOME}/plugins/${plugin_name}" - echo "Successfully enabled ${target_plugin}" - fi - done -} - -set_config_option() { - local option=$1 - local value=$2 - - # escape periods for usage in regular expressions - local escaped_option=$(echo ${option} | sed -e "s/\./\\\./g") - - # either override an existing entry, or append a new one - if grep -E "^${escaped_option}:.*" "${CONF_FILE}" > /dev/null; then - sed -i -e "s/${escaped_option}:.*/$option: $value/g" "${CONF_FILE}" - else - echo "${option}: ${value}" >> "${CONF_FILE}" - fi -} - -set_common_options() { - set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS} - set_config_option blob.server.port 6124 - set_config_option query.server.port 6125 -} - -prepare_job_manager_start() { - echo "Starting Job Manager" - copy_plugins_if_required - - set_common_options - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" -} - -if [ "$1" = "help" ]; then - echo "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|help)" - exit 0 -elif [ "$1" = "jobmanager" ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@" -elif [ "$1" = ${COMMAND_STANDALONE} ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "$@" -elif [ "$1" = "taskmanager" ]; then - shift 1 - echo "Starting Task Manager" - copy_plugins_if_required - - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)} - - set_common_options - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@" -fi - -exec "$@" diff --git a/1.11/scala_2.11-java8-debian/release.metadata b/1.11/scala_2.11-java8-debian/release.metadata deleted file mode 100644 index c3e4b01..0000000 --- a/1.11/scala_2.11-java8-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.11.4-scala_2.11-java8, 1.11-scala_2.11-java8, scala_2.11-java8, 1.11.4-scala_2.11, 1.11-scala_2.11, scala_2.11 -Architectures: amd64 diff --git a/1.11/scala_2.12-java11-debian/Dockerfile b/1.11/scala_2.12-java11-debian/Dockerfile deleted file mode 100644 index e6d0cc7..0000000 --- a/1.11/scala_2.12-java11-debian/Dockerfile +++ /dev/null @@ -1,87 +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. -############################################################################### - -FROM openjdk:11-jre - -# Install dependencies -RUN set -ex; \ - apt-get update; \ - apt-get -y install libsnappy1v5 gettext-base; \ - rm -rf /var/lib/apt/lists/* - -# Grab gosu for easy step-down from root -ENV GOSU_VERSION 1.11 -RUN set -ex; \ - wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)"; \ - wget -nv -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ - done && \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - chmod +x /usr/local/bin/gosu; \ - gosu nobody true - -# Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.11.4/flink-1.11.4-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.11.4/flink-1.11.4-bin-scala_2.12.tgz.asc \ - GPG_KEY=4A978875E56AA2100EB0CF12A244D52CF0A40279 \ - CHECK_GPG=true - -# Prepare environment -ENV FLINK_HOME=/opt/flink -ENV PATH=$FLINK_HOME/bin:$PATH -RUN groupadd --system --gid=9999 flink && \ - useradd --system --home-dir $FLINK_HOME --uid=9999 --gid=flink flink -WORKDIR $FLINK_HOME - -# Install Flink -RUN set -ex; \ - wget -nv -O flink.tgz "$FLINK_TGZ_URL"; \ - \ - if [ "$CHECK_GPG" = "true" ]; then \ - wget -nv -O flink.tgz.asc "$FLINK_ASC_URL"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys "$GPG_KEY" && break || : ; \ - done && \ - gpg --batch --verify flink.tgz.asc flink.tgz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" flink.tgz.asc; \ - fi; \ - \ - tar -xf flink.tgz --strip-components=1; \ - rm flink.tgz; \ - \ - chown -R flink:flink .; - -# Configure container -COPY docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] -EXPOSE 6123 8081 -CMD ["help"] diff --git a/1.11/scala_2.12-java11-debian/docker-entrypoint.sh b/1.11/scala_2.12-java11-debian/docker-entrypoint.sh deleted file mode 100755 index 6084f06..0000000 --- a/1.11/scala_2.12-java11-debian/docker-entrypoint.sh +++ /dev/null @@ -1,125 +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. -############################################################################### - -COMMAND_STANDALONE="standalone-job" - -# If unspecified, the hostname of the container is taken as the JobManager address -JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)} -CONF_FILE="${FLINK_HOME}/conf/flink-conf.yaml" - -drop_privs_cmd() { - if [ $(id -u) != 0 ]; then - # Don't need to drop privs if EUID != 0 - return - elif [ -x /sbin/su-exec ]; then - # Alpine - echo su-exec flink - else - # Others - echo gosu flink - fi -} - -copy_plugins_if_required() { - if [ -z "$ENABLE_BUILT_IN_PLUGINS" ]; then - return 0 - fi - - echo "Enabling required built-in plugins" - for target_plugin in $(echo "$ENABLE_BUILT_IN_PLUGINS" | tr ';' ' '); do - echo "Linking ${target_plugin} to plugin directory" - plugin_name=${target_plugin%.jar} - - mkdir -p "${FLINK_HOME}/plugins/${plugin_name}" - if [ ! -e "${FLINK_HOME}/opt/${target_plugin}" ]; then - echo "Plugin ${target_plugin} does not exist. Exiting." - exit 1 - else - ln -fs "${FLINK_HOME}/opt/${target_plugin}" "${FLINK_HOME}/plugins/${plugin_name}" - echo "Successfully enabled ${target_plugin}" - fi - done -} - -set_config_option() { - local option=$1 - local value=$2 - - # escape periods for usage in regular expressions - local escaped_option=$(echo ${option} | sed -e "s/\./\\\./g") - - # either override an existing entry, or append a new one - if grep -E "^${escaped_option}:.*" "${CONF_FILE}" > /dev/null; then - sed -i -e "s/${escaped_option}:.*/$option: $value/g" "${CONF_FILE}" - else - echo "${option}: ${value}" >> "${CONF_FILE}" - fi -} - -set_common_options() { - set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS} - set_config_option blob.server.port 6124 - set_config_option query.server.port 6125 -} - -prepare_job_manager_start() { - echo "Starting Job Manager" - copy_plugins_if_required - - set_common_options - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" -} - -if [ "$1" = "help" ]; then - echo "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|help)" - exit 0 -elif [ "$1" = "jobmanager" ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@" -elif [ "$1" = ${COMMAND_STANDALONE} ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "$@" -elif [ "$1" = "taskmanager" ]; then - shift 1 - echo "Starting Task Manager" - copy_plugins_if_required - - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)} - - set_common_options - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@" -fi - -exec "$@" diff --git a/1.11/scala_2.12-java11-debian/release.metadata b/1.11/scala_2.12-java11-debian/release.metadata deleted file mode 100644 index 754c096..0000000 --- a/1.11/scala_2.12-java11-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.11.4-scala_2.12-java11, 1.11-scala_2.12-java11, scala_2.12-java11, 1.11.4-java11, 1.11-java11, java11 -Architectures: amd64 diff --git a/1.11/scala_2.12-java8-debian/Dockerfile b/1.11/scala_2.12-java8-debian/Dockerfile deleted file mode 100644 index 399ee95..0000000 --- a/1.11/scala_2.12-java8-debian/Dockerfile +++ /dev/null @@ -1,87 +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. -############################################################################### - -FROM openjdk:8-jre - -# Install dependencies -RUN set -ex; \ - apt-get update; \ - apt-get -y install libsnappy1v5 gettext-base; \ - rm -rf /var/lib/apt/lists/* - -# Grab gosu for easy step-down from root -ENV GOSU_VERSION 1.11 -RUN set -ex; \ - wget -nv -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)"; \ - wget -nv -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ - done && \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - chmod +x /usr/local/bin/gosu; \ - gosu nobody true - -# Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.11.4/flink-1.11.4-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.11.4/flink-1.11.4-bin-scala_2.12.tgz.asc \ - GPG_KEY=4A978875E56AA2100EB0CF12A244D52CF0A40279 \ - CHECK_GPG=true - -# Prepare environment -ENV FLINK_HOME=/opt/flink -ENV PATH=$FLINK_HOME/bin:$PATH -RUN groupadd --system --gid=9999 flink && \ - useradd --system --home-dir $FLINK_HOME --uid=9999 --gid=flink flink -WORKDIR $FLINK_HOME - -# Install Flink -RUN set -ex; \ - wget -nv -O flink.tgz "$FLINK_TGZ_URL"; \ - \ - if [ "$CHECK_GPG" = "true" ]; then \ - wget -nv -O flink.tgz.asc "$FLINK_ASC_URL"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in ha.pool.sks-keyservers.net $(shuf -e \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --batch --keyserver "$server" --recv-keys "$GPG_KEY" && break || : ; \ - done && \ - gpg --batch --verify flink.tgz.asc flink.tgz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" flink.tgz.asc; \ - fi; \ - \ - tar -xf flink.tgz --strip-components=1; \ - rm flink.tgz; \ - \ - chown -R flink:flink .; - -# Configure container -COPY docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] -EXPOSE 6123 8081 -CMD ["help"] diff --git a/1.11/scala_2.12-java8-debian/docker-entrypoint.sh b/1.11/scala_2.12-java8-debian/docker-entrypoint.sh deleted file mode 100755 index 6084f06..0000000 --- a/1.11/scala_2.12-java8-debian/docker-entrypoint.sh +++ /dev/null @@ -1,125 +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. -############################################################################### - -COMMAND_STANDALONE="standalone-job" - -# If unspecified, the hostname of the container is taken as the JobManager address -JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)} -CONF_FILE="${FLINK_HOME}/conf/flink-conf.yaml" - -drop_privs_cmd() { - if [ $(id -u) != 0 ]; then - # Don't need to drop privs if EUID != 0 - return - elif [ -x /sbin/su-exec ]; then - # Alpine - echo su-exec flink - else - # Others - echo gosu flink - fi -} - -copy_plugins_if_required() { - if [ -z "$ENABLE_BUILT_IN_PLUGINS" ]; then - return 0 - fi - - echo "Enabling required built-in plugins" - for target_plugin in $(echo "$ENABLE_BUILT_IN_PLUGINS" | tr ';' ' '); do - echo "Linking ${target_plugin} to plugin directory" - plugin_name=${target_plugin%.jar} - - mkdir -p "${FLINK_HOME}/plugins/${plugin_name}" - if [ ! -e "${FLINK_HOME}/opt/${target_plugin}" ]; then - echo "Plugin ${target_plugin} does not exist. Exiting." - exit 1 - else - ln -fs "${FLINK_HOME}/opt/${target_plugin}" "${FLINK_HOME}/plugins/${plugin_name}" - echo "Successfully enabled ${target_plugin}" - fi - done -} - -set_config_option() { - local option=$1 - local value=$2 - - # escape periods for usage in regular expressions - local escaped_option=$(echo ${option} | sed -e "s/\./\\\./g") - - # either override an existing entry, or append a new one - if grep -E "^${escaped_option}:.*" "${CONF_FILE}" > /dev/null; then - sed -i -e "s/${escaped_option}:.*/$option: $value/g" "${CONF_FILE}" - else - echo "${option}: ${value}" >> "${CONF_FILE}" - fi -} - -set_common_options() { - set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS} - set_config_option blob.server.port 6124 - set_config_option query.server.port 6125 -} - -prepare_job_manager_start() { - echo "Starting Job Manager" - copy_plugins_if_required - - set_common_options - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" -} - -if [ "$1" = "help" ]; then - echo "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|help)" - exit 0 -elif [ "$1" = "jobmanager" ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@" -elif [ "$1" = ${COMMAND_STANDALONE} ]; then - shift 1 - prepare_job_manager_start - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "$@" -elif [ "$1" = "taskmanager" ]; then - shift 1 - echo "Starting Task Manager" - copy_plugins_if_required - - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)} - - set_common_options - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} - - if [ -n "${FLINK_PROPERTIES}" ]; then - echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" - fi - envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}" - - exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@" -fi - -exec "$@" diff --git a/1.11/scala_2.12-java8-debian/release.metadata b/1.11/scala_2.12-java8-debian/release.metadata deleted file mode 100644 index fee3a32..0000000 --- a/1.11/scala_2.12-java8-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.11.4-scala_2.12-java8, 1.11-scala_2.12-java8, scala_2.12-java8, 1.11.4-scala_2.12, 1.11-scala_2.12, scala_2.12, 1.11.4-java8, 1.11-java8, java8, 1.11.4, 1.11, latest -Architectures: amd64 diff --git a/1.12/scala_2.11-java11-debian/release.metadata b/1.12/scala_2.11-java11-debian/release.metadata deleted file mode 100644 index 85661b5..0000000 --- a/1.12/scala_2.11-java11-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.12.5-scala_2.11-java11, 1.12-scala_2.11-java11, scala_2.11-java11 -Architectures: amd64 diff --git a/1.12/scala_2.11-java8-debian/release.metadata b/1.12/scala_2.11-java8-debian/release.metadata deleted file mode 100644 index 4dfc616..0000000 --- a/1.12/scala_2.11-java8-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.12.5-scala_2.11-java8, 1.12-scala_2.11-java8, scala_2.11-java8, 1.12.5-scala_2.11, 1.12-scala_2.11, scala_2.11 -Architectures: amd64 diff --git a/1.12/scala_2.12-java11-debian/release.metadata b/1.12/scala_2.12-java11-debian/release.metadata deleted file mode 100644 index 8e0d978..0000000 --- a/1.12/scala_2.12-java11-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.12.5-scala_2.12-java11, 1.12-scala_2.12-java11, scala_2.12-java11, 1.12.5-java11, 1.12-java11, java11 -Architectures: amd64 diff --git a/1.12/scala_2.12-java8-debian/release.metadata b/1.12/scala_2.12-java8-debian/release.metadata deleted file mode 100644 index 807291a..0000000 --- a/1.12/scala_2.12-java8-debian/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.12.5-scala_2.12-java8, 1.12-scala_2.12-java8, scala_2.12-java8, 1.12.5-scala_2.12, 1.12-scala_2.12, scala_2.12, 1.12.5-java8, 1.12-java8, java8, 1.12.5, 1.12, latest -Architectures: amd64 diff --git a/1.12/scala_2.12-java11-debian/Dockerfile b/1.14/scala_2.11-java11-debian/Dockerfile similarity index 93% rename from 1.12/scala_2.12-java11-debian/Dockerfile rename to 1.14/scala_2.11-java11-debian/Dockerfile index 3087510..115abce 100644 --- a/1.12/scala_2.12-java11-debian/Dockerfile +++ b/1.14/scala_2.11-java11-debian/Dockerfile @@ -44,9 +44,9 @@ RUN set -ex; \ gosu nobody true # Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.12.5/flink-1.12.5-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.5/flink-1.12.5-bin-scala_2.12.tgz.asc \ - GPG_KEY=9545FBA24D2225795DBAAF8EFBB83C0A4FFB9CA8 \ +ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.14.0/flink-1.14.0-bin-scala_2.11.tgz \ + FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.14.0/flink-1.14.0-bin-scala_2.11.tgz.asc \ + GPG_KEY=31D2DD10BFC15A2D \ CHECK_GPG=true # Prepare environment diff --git a/1.12/scala_2.11-java11-debian/docker-entrypoint.sh b/1.14/scala_2.11-java11-debian/docker-entrypoint.sh similarity index 84% rename from 1.12/scala_2.11-java11-debian/docker-entrypoint.sh rename to 1.14/scala_2.11-java11-debian/docker-entrypoint.sh index 275488e..84fca0c 100755 --- a/1.12/scala_2.11-java11-debian/docker-entrypoint.sh +++ b/1.14/scala_2.11-java11-debian/docker-entrypoint.sh @@ -19,8 +19,6 @@ ############################################################################### COMMAND_STANDALONE="standalone-job" -# Deprecated, should be remove in Flink release 1.13 -COMMAND_NATIVE_KUBERNETES="native-k8s" COMMAND_HISTORY_SERVER="history-server" # If unspecified, the hostname of the container is taken as the JobManager address @@ -81,8 +79,9 @@ prepare_configuration() { set_config_option blob.server.port 6124 set_config_option query.server.port 6125 - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1} - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + if [ -n "${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}" ]; then + set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + fi if [ -n "${FLINK_PROPERTIES}" ]; then echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" @@ -132,23 +131,9 @@ elif [ "$1" = "taskmanager" ]; then echo "Starting Task Manager" exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}" -elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then - args=("${args[@]:1}") - - export _FLINK_HOME_DETERMINED=true - . $FLINK_HOME/bin/config.sh - export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Start commands for jobmanager and taskmanager are generated by Flink internally. - echo "Start command: ${args[@]}" - exec $(drop_privs_cmd) bash -c "${args[@]}" fi args=("${args[@]}") -# Set the Flink related environments -export _FLINK_HOME_DETERMINED=true -. $FLINK_HOME/bin/config.sh -export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Running command in pass-through mode exec $(drop_privs_cmd) "${args[@]}" diff --git a/1.14/scala_2.11-java11-debian/release.metadata b/1.14/scala_2.11-java11-debian/release.metadata new file mode 100644 index 0000000..34af158 --- /dev/null +++ b/1.14/scala_2.11-java11-debian/release.metadata @@ -0,0 +1,2 @@ +Tags: 1.14.0-scala_2.11-java11, 1.14-scala_2.11-java11, scala_2.11-java11 +Architectures: amd64 diff --git a/1.12/scala_2.11-java8-debian/Dockerfile b/1.14/scala_2.11-java8-debian/Dockerfile similarity index 93% rename from 1.12/scala_2.11-java8-debian/Dockerfile rename to 1.14/scala_2.11-java8-debian/Dockerfile index 6037c99..5e81ef8 100644 --- a/1.12/scala_2.11-java8-debian/Dockerfile +++ b/1.14/scala_2.11-java8-debian/Dockerfile @@ -44,9 +44,9 @@ RUN set -ex; \ gosu nobody true # Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.12.5/flink-1.12.5-bin-scala_2.11.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.5/flink-1.12.5-bin-scala_2.11.tgz.asc \ - GPG_KEY=9545FBA24D2225795DBAAF8EFBB83C0A4FFB9CA8 \ +ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.14.0/flink-1.14.0-bin-scala_2.11.tgz \ + FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.14.0/flink-1.14.0-bin-scala_2.11.tgz.asc \ + GPG_KEY=31D2DD10BFC15A2D \ CHECK_GPG=true # Prepare environment diff --git a/1.12/scala_2.11-java8-debian/docker-entrypoint.sh b/1.14/scala_2.11-java8-debian/docker-entrypoint.sh similarity index 84% rename from 1.12/scala_2.11-java8-debian/docker-entrypoint.sh rename to 1.14/scala_2.11-java8-debian/docker-entrypoint.sh index 275488e..84fca0c 100755 --- a/1.12/scala_2.11-java8-debian/docker-entrypoint.sh +++ b/1.14/scala_2.11-java8-debian/docker-entrypoint.sh @@ -19,8 +19,6 @@ ############################################################################### COMMAND_STANDALONE="standalone-job" -# Deprecated, should be remove in Flink release 1.13 -COMMAND_NATIVE_KUBERNETES="native-k8s" COMMAND_HISTORY_SERVER="history-server" # If unspecified, the hostname of the container is taken as the JobManager address @@ -81,8 +79,9 @@ prepare_configuration() { set_config_option blob.server.port 6124 set_config_option query.server.port 6125 - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1} - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + if [ -n "${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}" ]; then + set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + fi if [ -n "${FLINK_PROPERTIES}" ]; then echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" @@ -132,23 +131,9 @@ elif [ "$1" = "taskmanager" ]; then echo "Starting Task Manager" exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}" -elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then - args=("${args[@]:1}") - - export _FLINK_HOME_DETERMINED=true - . $FLINK_HOME/bin/config.sh - export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Start commands for jobmanager and taskmanager are generated by Flink internally. - echo "Start command: ${args[@]}" - exec $(drop_privs_cmd) bash -c "${args[@]}" fi args=("${args[@]}") -# Set the Flink related environments -export _FLINK_HOME_DETERMINED=true -. $FLINK_HOME/bin/config.sh -export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Running command in pass-through mode exec $(drop_privs_cmd) "${args[@]}" diff --git a/1.14/scala_2.11-java8-debian/release.metadata b/1.14/scala_2.11-java8-debian/release.metadata new file mode 100644 index 0000000..a6df53c --- /dev/null +++ b/1.14/scala_2.11-java8-debian/release.metadata @@ -0,0 +1,2 @@ +Tags: 1.14.0-scala_2.11-java8, 1.14-scala_2.11-java8, scala_2.11-java8, 1.14.0-scala_2.11, 1.14-scala_2.11, scala_2.11 +Architectures: amd64 diff --git a/1.12/scala_2.11-java11-debian/Dockerfile b/1.14/scala_2.12-java11-debian/Dockerfile similarity index 93% rename from 1.12/scala_2.11-java11-debian/Dockerfile rename to 1.14/scala_2.12-java11-debian/Dockerfile index 9acddac..0d2cb53 100644 --- a/1.12/scala_2.11-java11-debian/Dockerfile +++ b/1.14/scala_2.12-java11-debian/Dockerfile @@ -44,9 +44,9 @@ RUN set -ex; \ gosu nobody true # Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.12.5/flink-1.12.5-bin-scala_2.11.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.5/flink-1.12.5-bin-scala_2.11.tgz.asc \ - GPG_KEY=9545FBA24D2225795DBAAF8EFBB83C0A4FFB9CA8 \ +ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.14.0/flink-1.14.0-bin-scala_2.12.tgz \ + FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.14.0/flink-1.14.0-bin-scala_2.12.tgz.asc \ + GPG_KEY=31D2DD10BFC15A2D \ CHECK_GPG=true # Prepare environment diff --git a/1.12/scala_2.12-java11-debian/docker-entrypoint.sh b/1.14/scala_2.12-java11-debian/docker-entrypoint.sh similarity index 84% rename from 1.12/scala_2.12-java11-debian/docker-entrypoint.sh rename to 1.14/scala_2.12-java11-debian/docker-entrypoint.sh index 275488e..84fca0c 100755 --- a/1.12/scala_2.12-java11-debian/docker-entrypoint.sh +++ b/1.14/scala_2.12-java11-debian/docker-entrypoint.sh @@ -19,8 +19,6 @@ ############################################################################### COMMAND_STANDALONE="standalone-job" -# Deprecated, should be remove in Flink release 1.13 -COMMAND_NATIVE_KUBERNETES="native-k8s" COMMAND_HISTORY_SERVER="history-server" # If unspecified, the hostname of the container is taken as the JobManager address @@ -81,8 +79,9 @@ prepare_configuration() { set_config_option blob.server.port 6124 set_config_option query.server.port 6125 - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1} - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + if [ -n "${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}" ]; then + set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + fi if [ -n "${FLINK_PROPERTIES}" ]; then echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" @@ -132,23 +131,9 @@ elif [ "$1" = "taskmanager" ]; then echo "Starting Task Manager" exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}" -elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then - args=("${args[@]:1}") - - export _FLINK_HOME_DETERMINED=true - . $FLINK_HOME/bin/config.sh - export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Start commands for jobmanager and taskmanager are generated by Flink internally. - echo "Start command: ${args[@]}" - exec $(drop_privs_cmd) bash -c "${args[@]}" fi args=("${args[@]}") -# Set the Flink related environments -export _FLINK_HOME_DETERMINED=true -. $FLINK_HOME/bin/config.sh -export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Running command in pass-through mode exec $(drop_privs_cmd) "${args[@]}" diff --git a/1.14/scala_2.12-java11-debian/release.metadata b/1.14/scala_2.12-java11-debian/release.metadata new file mode 100644 index 0000000..72680c7 --- /dev/null +++ b/1.14/scala_2.12-java11-debian/release.metadata @@ -0,0 +1,2 @@ +Tags: 1.14.0-scala_2.12-java11, 1.14-scala_2.12-java11, scala_2.12-java11, 1.14.0-java11, 1.14-java11, java11 +Architectures: amd64 diff --git a/1.12/scala_2.12-java8-debian/Dockerfile b/1.14/scala_2.12-java8-debian/Dockerfile similarity index 93% rename from 1.12/scala_2.12-java8-debian/Dockerfile rename to 1.14/scala_2.12-java8-debian/Dockerfile index c7ef005..152f4dc 100644 --- a/1.12/scala_2.12-java8-debian/Dockerfile +++ b/1.14/scala_2.12-java8-debian/Dockerfile @@ -44,9 +44,9 @@ RUN set -ex; \ gosu nobody true # Configure Flink version -ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.12.5/flink-1.12.5-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.5/flink-1.12.5-bin-scala_2.12.tgz.asc \ - GPG_KEY=9545FBA24D2225795DBAAF8EFBB83C0A4FFB9CA8 \ +ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.14.0/flink-1.14.0-bin-scala_2.12.tgz \ + FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.14.0/flink-1.14.0-bin-scala_2.12.tgz.asc \ + GPG_KEY=31D2DD10BFC15A2D \ CHECK_GPG=true # Prepare environment diff --git a/1.12/scala_2.12-java8-debian/docker-entrypoint.sh b/1.14/scala_2.12-java8-debian/docker-entrypoint.sh similarity index 84% rename from 1.12/scala_2.12-java8-debian/docker-entrypoint.sh rename to 1.14/scala_2.12-java8-debian/docker-entrypoint.sh index 275488e..84fca0c 100755 --- a/1.12/scala_2.12-java8-debian/docker-entrypoint.sh +++ b/1.14/scala_2.12-java8-debian/docker-entrypoint.sh @@ -19,8 +19,6 @@ ############################################################################### COMMAND_STANDALONE="standalone-job" -# Deprecated, should be remove in Flink release 1.13 -COMMAND_NATIVE_KUBERNETES="native-k8s" COMMAND_HISTORY_SERVER="history-server" # If unspecified, the hostname of the container is taken as the JobManager address @@ -81,8 +79,9 @@ prepare_configuration() { set_config_option blob.server.port 6124 set_config_option query.server.port 6125 - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1} - set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + if [ -n "${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}" ]; then + set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS} + fi if [ -n "${FLINK_PROPERTIES}" ]; then echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}" @@ -132,23 +131,9 @@ elif [ "$1" = "taskmanager" ]; then echo "Starting Task Manager" exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}" -elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then - args=("${args[@]:1}") - - export _FLINK_HOME_DETERMINED=true - . $FLINK_HOME/bin/config.sh - export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Start commands for jobmanager and taskmanager are generated by Flink internally. - echo "Start command: ${args[@]}" - exec $(drop_privs_cmd) bash -c "${args[@]}" fi args=("${args[@]}") -# Set the Flink related environments -export _FLINK_HOME_DETERMINED=true -. $FLINK_HOME/bin/config.sh -export FLINK_CLASSPATH="`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" - # Running command in pass-through mode exec $(drop_privs_cmd) "${args[@]}" diff --git a/1.14/scala_2.12-java8-debian/release.metadata b/1.14/scala_2.12-java8-debian/release.metadata new file mode 100644 index 0000000..5d5c705 --- /dev/null +++ b/1.14/scala_2.12-java8-debian/release.metadata @@ -0,0 +1,2 @@ +Tags: 1.14.0-scala_2.12-java8, 1.14-scala_2.12-java8, scala_2.12-java8, 1.14.0-scala_2.12, 1.14-scala_2.12, scala_2.12, 1.14.0-java8, 1.14-java8, java8, 1.14.0, 1.14, latest +Architectures: amd64