From acc525b48994fd82e69d488e8882476782c4101cf897a42b3d5ce203fa605032 Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Tue, 23 Mar 2021 16:40:24 +0000 Subject: [PATCH 1/6] Fixed paths OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/java15-devel-container?expand=0&rev=6 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7973a45..61084d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Defines the tag for OBS and build script builds: -#!BuildTag: opensuse/java-devel:15 -#!BuildTag: opensuse/java-devel:%%PKG_VERSION%% -#!BuildTag: opensuse/java-devel:%%PKG_VERSION%%.%RELEASE% +#!BuildTag: java-devel:15 +#!BuildTag: java-devel:%%PKG_VERSION%% +#!BuildTag: java-devel:%%PKG_VERSION%%.%RELEASE% FROM opensuse/tumbleweed @@ -11,7 +11,7 @@ PREFIXEDLABEL org.opencontainers.image.description="Environment for Java 15 deve PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%" PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%" PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%" -PREFIXEDLABEL org.opensuse.reference="opensuse/java-devel:%%PKG_VERSION%%.%RELEASE%" +PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/java-devel:%%PKG_VERSION%%.%RELEASE%" # Work around https://github.com/openSUSE/obs-build/issues/487 RUN zypper install -y openSUSE-release-appliance-docker From c6c82803aee49328c647c1f5deafcb053d7ccc3e65e88ec64eb0b209a29db086 Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Tue, 23 Mar 2021 19:25:11 +0000 Subject: [PATCH 2/6] Not having "opensuse" as prefix does not conform to specification as per conversation with fvogt OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/java15-devel-container?expand=0&rev=7 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61084d6..07f23c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Defines the tag for OBS and build script builds: -#!BuildTag: java-devel:15 -#!BuildTag: java-devel:%%PKG_VERSION%% -#!BuildTag: java-devel:%%PKG_VERSION%%.%RELEASE% +#!BuildTag: opensuse/java-devel:15 +#!BuildTag: opensuse/java-devel:%%PKG_VERSION%% +#!BuildTag: opensuse/java-devel:%%PKG_VERSION%%.%RELEASE% FROM opensuse/tumbleweed @@ -11,7 +11,7 @@ PREFIXEDLABEL org.opencontainers.image.description="Environment for Java 15 deve PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%" PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%" PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%" -PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/java-devel:%%PKG_VERSION%%.%RELEASE%" +PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/java-devel:%%PKG_VERSION%%.%RELEASE%" # Work around https://github.com/openSUSE/obs-build/issues/487 RUN zypper install -y openSUSE-release-appliance-docker From 4f095de910eaa7bfb498a2ac23cdfc57eb93887eb721da117c671eebde8230cd Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Tue, 23 Mar 2021 19:26:00 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/java15-devel-container?expand=0&rev=8 --- java15-devel-container.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java15-devel-container.changes b/java15-devel-container.changes index 401f899..5ae8fba 100644 --- a/java15-devel-container.changes +++ b/java15-devel-container.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 23 19:25:53 UTC 2021 - Marco Varlese + +- Not having "opensuse" as prefix does not conform to specification as per conversation with fvogt + ------------------------------------------------------------------- Fri Mar 19 14:40:35 UTC 2021 - Marco Varlese From b23dcc5aaae5d9590b2c166c3e30731ef1db9457fee5d53a2b5525e386a50fa5 Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Wed, 24 Mar 2021 12:19:38 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/java15-devel-container?expand=0&rev=9 --- java15-devel-container.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java15-devel-container.changes b/java15-devel-container.changes index 5ae8fba..00e2ca6 100644 --- a/java15-devel-container.changes +++ b/java15-devel-container.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 24 12:19:36 UTC 2021 - Marco Varlese + +- Renamed tag to follow upstream + ------------------------------------------------------------------- Tue Mar 23 19:25:53 UTC 2021 - Marco Varlese From 37878bbe48d094a64958e88690d1f5d78473f1430defef8140095bfc84e206f0 Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Wed, 24 Mar 2021 12:20:08 +0000 Subject: [PATCH 5/6] Renamed tag to follow upstream OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/java15-devel-container?expand=0&rev=10 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 07f23c2..add7b21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Defines the tag for OBS and build script builds: -#!BuildTag: opensuse/java-devel:15 -#!BuildTag: opensuse/java-devel:%%PKG_VERSION%% -#!BuildTag: opensuse/java-devel:%%PKG_VERSION%%.%RELEASE% +#!BuildTag: opensuse/openjdk:15 +#!BuildTag: opensuse/openjdk:%%PKG_VERSION%% +#!BuildTag: opensuse/openjdk:%%PKG_VERSION%%.%RELEASE% FROM opensuse/tumbleweed @@ -11,7 +11,7 @@ PREFIXEDLABEL org.opencontainers.image.description="Environment for Java 15 deve PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%" PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%" PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%" -PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/java-devel:%%PKG_VERSION%%.%RELEASE%" +PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/openjdk:%%PKG_VERSION%%.%RELEASE%" # Work around https://github.com/openSUSE/obs-build/issues/487 RUN zypper install -y openSUSE-release-appliance-docker From 2c7a6386b4a00552480d5c6344b7339371ee2d73ae778fadec3ee9cde22b51af Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Wed, 24 Mar 2021 12:30:58 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/java15-devel-container?expand=0&rev=11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index add7b21..6ebf961 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM opensuse/tumbleweed -# labelprefix=org.opensuse.java-devel +# labelprefix=org.opensuse.openjdk PREFIXEDLABEL org.opencontainers.image.title="Java 15 development container" PREFIXEDLABEL org.opencontainers.image.description="Environment for Java 15 development" PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%"