You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2020/07/30 13:39:17 UTC
[flink-docker] branch dev-1.10 updated: [FLINK-16260] Generate
release.metadata file (#34)
This is an automated email from the ASF dual-hosted git repository.
rmetzger pushed a commit to branch dev-1.10
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
The following commit(s) were added to refs/heads/dev-1.10 by this push:
new f9c997a [FLINK-16260] Generate release.metadata file (#34)
f9c997a is described below
commit f9c997ade302883d3347e08b1c6a5f33e23169dd
Author: Robert Metzger <89...@users.noreply.github.com>
AuthorDate: Thu Jul 30 15:39:10 2020 +0200
[FLINK-16260] Generate release.metadata file (#34)
---
Dockerfile-debian.template | 2 +-
add-custom.sh | 6 ++---
add-version.sh | 7 +++--
common.sh | 26 -------------------
generator.sh | 62 +++++++++++++++++++++++++++++++++++++++++++++
testing/run_travis_tests.sh | 12 ++++-----
6 files changed, 76 insertions(+), 39 deletions(-)
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 7222314..58607d4 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
-FROM openjdk:8-jre
+FROM %%FROM_IMAGE%%
# Install dependencies
RUN set -ex; \
diff --git a/add-custom.sh b/add-custom.sh
index c863f3f..12c0d5c 100755
--- a/add-custom.sh
+++ b/add-custom.sh
@@ -4,7 +4,7 @@
# Flink distribution.
# This is exlusively for development purposes.
-source "$(dirname "$0")"/common.sh
+source "$(dirname "$0")"/generator.sh
function usage() {
echo >&2 "usage: $0 -u binary-download-url [-n name]"
@@ -43,7 +43,7 @@ echo -n >&2 "Generating Dockerfiles..."
for source_variant in "${SOURCE_VARIANTS[@]}"; do
dir="dev/${name}-${source_variant}"
rm -rf "${dir}"
-
- generate "${dir}" "${binary_download_url}" "" "" false ${source_variant}
+ mkdir "$dir"
+ generateDockerfile "${dir}" "${binary_download_url}" "" "" false ${source_variant}
done
echo >&2 " done."
diff --git a/add-version.sh b/add-version.sh
index 1cc87ee..c231a05 100755
--- a/add-version.sh
+++ b/add-version.sh
@@ -10,7 +10,6 @@
#
# See other repos (e.g. httpd, cassandra) for update.sh examples.
-source "$(dirname "$0")"/common.sh
function usage() {
echo >&2 "usage: $0 -r flink-release -f flink-version"
@@ -98,6 +97,8 @@ fi
mkdir "$flink_release"
+source "$(dirname "$0")"/generator.sh
+
echo -n >&2 "Generating Dockerfiles..."
for source_variant in "${SOURCE_VARIANTS[@]}"; do
for scala_version in "${scala_versions[@]}"; do
@@ -109,7 +110,9 @@ for source_variant in "${SOURCE_VARIANTS[@]}"; do
# Not all mirrors have the .asc files
flink_asc_url=https://www.apache.org/dist/${flink_url_file_path}.asc
- generate "${dir}" "${flink_tgz_url}" "${flink_asc_url}" ${gpg_key} true ${source_variant}
+ mkdir "$dir"
+ generateDockerfile "${dir}" "${flink_tgz_url}" "${flink_asc_url}" ${gpg_key} true ${source_variant}
+ generateReleaseMetadata "${dir}" ${flink_release} ${flink_version} ${scala_version} ${source_variant}
done
done
echo >&2 " done."
diff --git a/common.sh b/common.sh
deleted file mode 100644
index 0232930..0000000
--- a/common.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -e
-
-# Defaults, can vary between versions
-export SOURCE_VARIANTS=( debian )
-
-function generate() {
- dir=$1
- binary_download_url=$2
- asc_download_url=$3
- gpg_key=$4
- check_gpg=$5
- source_variant=$6
-
- mkdir "$dir"
- cp docker-entrypoint.sh "$dir/docker-entrypoint.sh"
-
- # '&' has special semantics in sed replacement patterns
- escaped_binary_download_url=$(echo "$binary_download_url" | sed 's/&/\\\&/')
-
- sed \
- -e "s,%%BINARY_DOWNLOAD_URL%%,${escaped_binary_download_url}," \
- -e "s,%%ASC_DOWNLOAD_URL%%,$asc_download_url," \
- -e "s/%%GPG_KEY%%/$gpg_key/" \
- -e "s/%%CHECK_GPG%%/${check_gpg}/" \
- "Dockerfile-$source_variant.template" > "$dir/Dockerfile"
-}
diff --git a/generator.sh b/generator.sh
new file mode 100644
index 0000000..7393af9
--- /dev/null
+++ b/generator.sh
@@ -0,0 +1,62 @@
+#!/bin/bash -e
+
+export SOURCE_VARIANTS=(debian )
+
+export DEFAULT_SCALA="2.12"
+
+function generateDockerfile {
+ # define variables
+ dir=$1
+ binary_download_url=$2
+ asc_download_url=$3
+ gpg_key=$4
+ check_gpg=$5
+ source_variant=$6
+
+ from_docker_image="openjdk:8-jre"
+
+ cp docker-entrypoint.sh "$dir/docker-entrypoint.sh"
+
+ # '&' has special semantics in sed replacement patterns
+ escaped_binary_download_url=$(echo "$binary_download_url" | sed 's/&/\\\&/')
+
+ # generate Dockerfile
+ sed \
+ -e "s,%%BINARY_DOWNLOAD_URL%%,${escaped_binary_download_url}," \
+ -e "s,%%ASC_DOWNLOAD_URL%%,$asc_download_url," \
+ -e "s/%%GPG_KEY%%/$gpg_key/" \
+ -e "s/%%CHECK_GPG%%/${check_gpg}/" \
+ -e "s/%%FROM_IMAGE%%/${from_docker_image}/" \
+ "Dockerfile-$source_variant.template" > "$dir/Dockerfile"
+}
+
+function generateReleaseMetadata {
+ dir=$1
+ flink_release=$2
+ flink_version=$3
+ scala_version=$4
+
+ # example "1.2.0-scala_2.11"
+ full_tag=${flink_version}-scala_${scala_version}
+
+ # example "1.2-scala_2.11"
+ short_tag=${flink_release}-scala_${scala_version}
+
+ # example "scala_2.12-"
+ scala_tag="scala_${scala_version}"
+
+ tags="$full_tag, $short_tag, $scala_tag"
+
+ if [[ "$scala_version" == "$DEFAULT_SCALA" ]]; then
+ # we are generating the image for the latest scala version, add:
+ # "1.2.0"
+ # "1.2"
+ # "latest"
+ tags="$tags, ${flink_version}, ${flink_release}, latest"
+ fi
+
+ echo "Tags: $tags" >> $dir/release.metadata
+
+ # We currently only support amd64 with Flink.
+ echo "Architectures: amd64" >> $dir/release.metadata
+}
diff --git a/testing/run_travis_tests.sh b/testing/run_travis_tests.sh
index 44e2c63..e333701 100755
--- a/testing/run_travis_tests.sh
+++ b/testing/run_travis_tests.sh
@@ -13,12 +13,10 @@ BRANCH="$TRAVIS_BRANCH"
./add-version.sh -r 1.10 -f 1.10.1
-if [ -z "$IS_PULL_REQUEST" ] && [ "$BRANCH" = "dev-1.10" ]; then
- smoke_test_all_images
- smoke_test_one_image_non_root
-else
- # For pull requests and branches, test one image
- smoke_test_one_image
-fi
+smoke_test_all_images
+smoke_test_one_image_non_root
+
+
+echo "Test successfully finished"
# vim: et ts=2 sw=2