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:52:51 UTC
[flink-docker] branch master updated (e47a802 -> d82ab62)
This is an automated email from the ASF dual-hosted git repository.
rmetzger pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git.
from e47a802 [FLINK-16260] Change generate-stackbrew-library.sh to support new release.metadata file
new 8aafb84 [FLINK-16260] Add release.metadata files + Java 11 release for 1.11.1
new d82ab62 [hotfix] Fix regex to remove scala_x.xx tags properly
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.10/scala_2.11-debian/release.metadata | 2 ++
1.10/scala_2.12-debian/release.metadata | 2 ++
1.11/{scala_2.11-debian => scala_2.11-java11-debian}/Dockerfile | 2 +-
.../docker-entrypoint.sh | 0
1.11/scala_2.11-java11-debian/release.metadata | 2 ++
1.11/{scala_2.11-debian => scala_2.11-java8-debian}/Dockerfile | 0
.../{scala_2.11-debian => scala_2.11-java8-debian}/docker-entrypoint.sh | 0
1.11/scala_2.11-java8-debian/release.metadata | 2 ++
1.11/{scala_2.12-debian => scala_2.12-java11-debian}/Dockerfile | 2 +-
.../docker-entrypoint.sh | 0
1.11/scala_2.12-java11-debian/release.metadata | 2 ++
1.11/{scala_2.12-debian => scala_2.12-java8-debian}/Dockerfile | 0
.../{scala_2.12-debian => scala_2.12-java8-debian}/docker-entrypoint.sh | 0
1.11/scala_2.12-java8-debian/release.metadata | 2 ++
generate-stackbrew-library.sh | 2 +-
15 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 1.10/scala_2.11-debian/release.metadata
create mode 100644 1.10/scala_2.12-debian/release.metadata
copy 1.11/{scala_2.11-debian => scala_2.11-java11-debian}/Dockerfile (99%)
copy 1.11/{scala_2.12-debian => scala_2.11-java11-debian}/docker-entrypoint.sh (100%)
create mode 100644 1.11/scala_2.11-java11-debian/release.metadata
rename 1.11/{scala_2.11-debian => scala_2.11-java8-debian}/Dockerfile (100%)
rename 1.11/{scala_2.11-debian => scala_2.11-java8-debian}/docker-entrypoint.sh (100%)
create mode 100644 1.11/scala_2.11-java8-debian/release.metadata
copy 1.11/{scala_2.12-debian => scala_2.12-java11-debian}/Dockerfile (99%)
copy 1.11/{scala_2.12-debian => scala_2.12-java11-debian}/docker-entrypoint.sh (100%)
create mode 100644 1.11/scala_2.12-java11-debian/release.metadata
rename 1.11/{scala_2.12-debian => scala_2.12-java8-debian}/Dockerfile (100%)
rename 1.11/{scala_2.12-debian => scala_2.12-java8-debian}/docker-entrypoint.sh (100%)
create mode 100644 1.11/scala_2.12-java8-debian/release.metadata
[flink-docker] 01/02: [FLINK-16260] Add release.metadata files +
Java 11 release for 1.11.1
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmetzger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
commit 8aafb8413a9675ebbe74fe3e5d22141f26922977
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Thu Jul 30 14:45:01 2020 +0200
[FLINK-16260] Add release.metadata files + Java 11 release for 1.11.1
This closes #35
---
1.10/scala_2.11-debian/release.metadata | 2 ++
1.10/scala_2.12-debian/release.metadata | 2 ++
1.11/{scala_2.11-debian => scala_2.11-java11-debian}/Dockerfile | 2 +-
.../docker-entrypoint.sh | 0
1.11/scala_2.11-java11-debian/release.metadata | 2 ++
1.11/{scala_2.11-debian => scala_2.11-java8-debian}/Dockerfile | 0
.../{scala_2.11-debian => scala_2.11-java8-debian}/docker-entrypoint.sh | 0
1.11/scala_2.11-java8-debian/release.metadata | 2 ++
1.11/{scala_2.12-debian => scala_2.12-java11-debian}/Dockerfile | 2 +-
.../docker-entrypoint.sh | 0
1.11/scala_2.12-java11-debian/release.metadata | 2 ++
1.11/{scala_2.12-debian => scala_2.12-java8-debian}/Dockerfile | 0
.../{scala_2.12-debian => scala_2.12-java8-debian}/docker-entrypoint.sh | 0
1.11/scala_2.12-java8-debian/release.metadata | 2 ++
14 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/1.10/scala_2.11-debian/release.metadata b/1.10/scala_2.11-debian/release.metadata
new file mode 100644
index 0000000..4825226
--- /dev/null
+++ b/1.10/scala_2.11-debian/release.metadata
@@ -0,0 +1,2 @@
+Tags: 1.10.1-scala_2.11, 1.10-scala_2.11, scala_2.11
+Architectures: amd64
diff --git a/1.10/scala_2.12-debian/release.metadata b/1.10/scala_2.12-debian/release.metadata
new file mode 100644
index 0000000..e85e52c
--- /dev/null
+++ b/1.10/scala_2.12-debian/release.metadata
@@ -0,0 +1,2 @@
+Tags: 1.10.1-scala_2.12, 1.10-scala_2.12, scala_2.12, 1.10.1, 1.10, latest
+Architectures: amd64
diff --git a/1.11/scala_2.11-debian/Dockerfile b/1.11/scala_2.11-java11-debian/Dockerfile
similarity index 99%
copy from 1.11/scala_2.11-debian/Dockerfile
copy to 1.11/scala_2.11-java11-debian/Dockerfile
index 4f55fcd..952af11 100644
--- a/1.11/scala_2.11-debian/Dockerfile
+++ b/1.11/scala_2.11-java11-debian/Dockerfile
@@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
-FROM openjdk:8-jre
+FROM openjdk:11-jre
# Install dependencies
RUN set -ex; \
diff --git a/1.11/scala_2.12-debian/docker-entrypoint.sh b/1.11/scala_2.11-java11-debian/docker-entrypoint.sh
similarity index 100%
copy from 1.11/scala_2.12-debian/docker-entrypoint.sh
copy to 1.11/scala_2.11-java11-debian/docker-entrypoint.sh
diff --git a/1.11/scala_2.11-java11-debian/release.metadata b/1.11/scala_2.11-java11-debian/release.metadata
new file mode 100644
index 0000000..db7eaa1
--- /dev/null
+++ b/1.11/scala_2.11-java11-debian/release.metadata
@@ -0,0 +1,2 @@
+Tags: 1.11.1-scala_2.11-java11, 1.11-scala_2.11-java11, scala_2.11-java11
+Architectures: amd64
diff --git a/1.11/scala_2.11-debian/Dockerfile b/1.11/scala_2.11-java8-debian/Dockerfile
similarity index 100%
rename from 1.11/scala_2.11-debian/Dockerfile
rename to 1.11/scala_2.11-java8-debian/Dockerfile
diff --git a/1.11/scala_2.11-debian/docker-entrypoint.sh b/1.11/scala_2.11-java8-debian/docker-entrypoint.sh
similarity index 100%
rename from 1.11/scala_2.11-debian/docker-entrypoint.sh
rename to 1.11/scala_2.11-java8-debian/docker-entrypoint.sh
diff --git a/1.11/scala_2.11-java8-debian/release.metadata b/1.11/scala_2.11-java8-debian/release.metadata
new file mode 100644
index 0000000..d91cde5
--- /dev/null
+++ b/1.11/scala_2.11-java8-debian/release.metadata
@@ -0,0 +1,2 @@
+Tags: 1.11.1-scala_2.11-java8, 1.11-scala_2.11-java8, scala_2.11-java8, 1.11.1-scala_2.11, 1.11-scala_2.11, scala_2.11
+Architectures: amd64
diff --git a/1.11/scala_2.12-debian/Dockerfile b/1.11/scala_2.12-java11-debian/Dockerfile
similarity index 99%
copy from 1.11/scala_2.12-debian/Dockerfile
copy to 1.11/scala_2.12-java11-debian/Dockerfile
index 2032bad..5fd5b4a 100644
--- a/1.11/scala_2.12-debian/Dockerfile
+++ b/1.11/scala_2.12-java11-debian/Dockerfile
@@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
-FROM openjdk:8-jre
+FROM openjdk:11-jre
# Install dependencies
RUN set -ex; \
diff --git a/1.11/scala_2.12-debian/docker-entrypoint.sh b/1.11/scala_2.12-java11-debian/docker-entrypoint.sh
similarity index 100%
copy from 1.11/scala_2.12-debian/docker-entrypoint.sh
copy to 1.11/scala_2.12-java11-debian/docker-entrypoint.sh
diff --git a/1.11/scala_2.12-java11-debian/release.metadata b/1.11/scala_2.12-java11-debian/release.metadata
new file mode 100644
index 0000000..cb6af21
--- /dev/null
+++ b/1.11/scala_2.12-java11-debian/release.metadata
@@ -0,0 +1,2 @@
+Tags: 1.11.1-scala_2.12-java11, 1.11-scala_2.12-java11, scala_2.12-java11, 1.11.1-java11, 1.11-java11, latest-java11
+Architectures: amd64
diff --git a/1.11/scala_2.12-debian/Dockerfile b/1.11/scala_2.12-java8-debian/Dockerfile
similarity index 100%
rename from 1.11/scala_2.12-debian/Dockerfile
rename to 1.11/scala_2.12-java8-debian/Dockerfile
diff --git a/1.11/scala_2.12-debian/docker-entrypoint.sh b/1.11/scala_2.12-java8-debian/docker-entrypoint.sh
similarity index 100%
rename from 1.11/scala_2.12-debian/docker-entrypoint.sh
rename to 1.11/scala_2.12-java8-debian/docker-entrypoint.sh
diff --git a/1.11/scala_2.12-java8-debian/release.metadata b/1.11/scala_2.12-java8-debian/release.metadata
new file mode 100644
index 0000000..d5d5bda
--- /dev/null
+++ b/1.11/scala_2.12-java8-debian/release.metadata
@@ -0,0 +1,2 @@
+Tags: 1.11.1-scala_2.12-java8, 1.11-scala_2.12-java8, scala_2.12-java8, 1.11.1-scala_2.12, 1.11-scala_2.12, scala_2.12, 1.11.1-java8, 1.11-java8, latest-java8, 1.11.1, 1.11, latest
+Architectures: amd64
[flink-docker] 02/02: [hotfix] Fix regex to remove scala_x.xx tags
properly
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmetzger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
commit d82ab62895fddbeb10c963ef95f0860b2b515ddc
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Thu Jul 30 15:31:41 2020 +0200
[hotfix] Fix regex to remove scala_x.xx tags properly
---
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 2a7307a..98ffe13 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -47,7 +47,7 @@ pruneTags() {
else
# remove "latest" and any "scala_" tag, unless it is the latest version
# the "scala_" tag has a similar semantic as the "latest" tag in docker registries.
- echo $tags | sed -E 's|, (scala\|latest)[-_[:alnum:]]*||g'
+ echo $tags | sed -E 's|, (scala\|latest)[-_.[:alnum:]]*||g'
fi
}