You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by pn...@apache.org on 2020/07/06 18:23:25 UTC
[flink-docker] branch master updated (3179482 -> 949e445)
This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git.
from 3179482 Update Dockerfiles for 1.10.1 release
new be3acf9 [FLINK-18497] Update the latest version to 1.11
new 949e445 [FLINK-18497] Update Dockerfiles for 1.11.0 release
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
{1.9 => 1.11}/scala_2.11-debian/Dockerfile | 10 +-
.../scala_2.11-debian}/docker-entrypoint.sh | 0
{1.9 => 1.11}/scala_2.12-debian/Dockerfile | 10 +-
.../scala_2.12-debian/docker-entrypoint.sh | 0
1.9/scala_2.11-debian/docker-entrypoint.sh | 114 ---------------------
1.9/scala_2.12-debian/docker-entrypoint.sh | 114 ---------------------
generate-stackbrew-library.sh | 2 +-
7 files changed, 11 insertions(+), 239 deletions(-)
rename {1.9 => 1.11}/scala_2.11-debian/Dockerfile (92%)
copy {1.10/scala_2.12-debian => 1.11/scala_2.11-debian}/docker-entrypoint.sh (100%)
rename {1.9 => 1.11}/scala_2.12-debian/Dockerfile (92%)
copy {1.10 => 1.11}/scala_2.12-debian/docker-entrypoint.sh (100%)
delete mode 100755 1.9/scala_2.11-debian/docker-entrypoint.sh
delete mode 100755 1.9/scala_2.12-debian/docker-entrypoint.sh
[flink-docker] 01/02: [FLINK-18497] Update the latest version to
1.11
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
commit be3acf9f657e82c2f0e769b5fe6ca9104d50b64d
Author: Piotr Nowojski <pi...@gmail.com>
AuthorDate: Mon Jul 6 13:36:19 2020 +0200
[FLINK-18497] Update the latest version to 1.11
---
generate-stackbrew-library.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index c0f811c..965045c 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -9,7 +9,7 @@
set -eu
declare -A aliases=(
- [1.10]='latest'
+ [1.11]='latest'
)
self="$(basename "$BASH_SOURCE")"
[flink-docker] 02/02: [FLINK-18497] Update Dockerfiles for 1.11.0
release
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
commit 949e445006c4fc288813900c264847d23d3e33d4
Author: Piotr Nowojski <pi...@gmail.com>
AuthorDate: Mon Jul 6 14:59:43 2020 +0200
[FLINK-18497] Update Dockerfiles for 1.11.0 release
---
{1.9 => 1.11}/scala_2.11-debian/Dockerfile | 10 +++++-----
.../scala_2.11-debian/docker-entrypoint.sh | 21 ++++++++++++++++-----
{1.9 => 1.11}/scala_2.12-debian/Dockerfile | 10 +++++-----
.../scala_2.12-debian/docker-entrypoint.sh | 21 ++++++++++++++++-----
4 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/1.9/scala_2.11-debian/Dockerfile b/1.11/scala_2.11-debian/Dockerfile
similarity index 92%
rename from 1.9/scala_2.11-debian/Dockerfile
rename to 1.11/scala_2.11-debian/Dockerfile
index 8f71da8..7daf5e9 100644
--- a/1.9/scala_2.11-debian/Dockerfile
+++ b/1.11/scala_2.11-debian/Dockerfile
@@ -44,10 +44,10 @@ 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.9.3/flink-1.9.3-bin-scala_2.11.tgz \
- FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.9.3/flink-1.9.3-bin-scala_2.11.tgz.asc \
- GPG_KEY=6B6291A8502BA8F0913AE04DDEB95B05BF075300 \
- SKIP_GPG=false
+ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.11.0/flink-1.11.0-bin-scala_2.11.tgz \
+ FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.11.0/flink-1.11.0-bin-scala_2.11.tgz.asc \
+ GPG_KEY=2DA85B93244FDFA19A6244500653C0A2CEA00D0E \
+ CHECK_GPG=true
# Prepare environment
ENV FLINK_HOME=/opt/flink
@@ -60,7 +60,7 @@ WORKDIR $FLINK_HOME
RUN set -ex; \
wget -nv -O flink.tgz "$FLINK_TGZ_URL"; \
\
- if [ "$SKIP_GPG" = "false" ]; then \
+ 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 \
diff --git a/1.9/scala_2.11-debian/docker-entrypoint.sh b/1.11/scala_2.11-debian/docker-entrypoint.sh
similarity index 91%
rename from 1.9/scala_2.11-debian/docker-entrypoint.sh
rename to 1.11/scala_2.11-debian/docker-entrypoint.sh
index 011ccea..6084f06 100755
--- a/1.9/scala_2.11-debian/docker-entrypoint.sh
+++ b/1.11/scala_2.11-debian/docker-entrypoint.sh
@@ -18,6 +18,8 @@
# 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"
@@ -77,11 +79,7 @@ set_common_options() {
set_config_option query.server.port 6125
}
-if [ "$1" = "help" ]; then
- echo "Usage: $(basename "$0") (jobmanager|taskmanager|help)"
- exit 0
-elif [ "$1" = "jobmanager" ]; then
- shift 1
+prepare_job_manager_start() {
echo "Starting Job Manager"
copy_plugins_if_required
@@ -91,8 +89,21 @@ elif [ "$1" = "jobmanager" ]; 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"
diff --git a/1.9/scala_2.12-debian/Dockerfile b/1.11/scala_2.12-debian/Dockerfile
similarity index 92%
rename from 1.9/scala_2.12-debian/Dockerfile
rename to 1.11/scala_2.12-debian/Dockerfile
index 095e9d2..6e8e116 100644
--- a/1.9/scala_2.12-debian/Dockerfile
+++ b/1.11/scala_2.12-debian/Dockerfile
@@ -44,10 +44,10 @@ 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.9.3/flink-1.9.3-bin-scala_2.12.tgz \
- FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.9.3/flink-1.9.3-bin-scala_2.12.tgz.asc \
- GPG_KEY=6B6291A8502BA8F0913AE04DDEB95B05BF075300 \
- SKIP_GPG=false
+ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.11.0/flink-1.11.0-bin-scala_2.12.tgz \
+ FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.11.0/flink-1.11.0-bin-scala_2.12.tgz.asc \
+ GPG_KEY=2DA85B93244FDFA19A6244500653C0A2CEA00D0E \
+ CHECK_GPG=true
# Prepare environment
ENV FLINK_HOME=/opt/flink
@@ -60,7 +60,7 @@ WORKDIR $FLINK_HOME
RUN set -ex; \
wget -nv -O flink.tgz "$FLINK_TGZ_URL"; \
\
- if [ "$SKIP_GPG" = "false" ]; then \
+ 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 \
diff --git a/1.9/scala_2.12-debian/docker-entrypoint.sh b/1.11/scala_2.12-debian/docker-entrypoint.sh
similarity index 91%
rename from 1.9/scala_2.12-debian/docker-entrypoint.sh
rename to 1.11/scala_2.12-debian/docker-entrypoint.sh
index 011ccea..6084f06 100755
--- a/1.9/scala_2.12-debian/docker-entrypoint.sh
+++ b/1.11/scala_2.12-debian/docker-entrypoint.sh
@@ -18,6 +18,8 @@
# 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"
@@ -77,11 +79,7 @@ set_common_options() {
set_config_option query.server.port 6125
}
-if [ "$1" = "help" ]; then
- echo "Usage: $(basename "$0") (jobmanager|taskmanager|help)"
- exit 0
-elif [ "$1" = "jobmanager" ]; then
- shift 1
+prepare_job_manager_start() {
echo "Starting Job Manager"
copy_plugins_if_required
@@ -91,8 +89,21 @@ elif [ "$1" = "jobmanager" ]; 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"