From 6a01e6d54b5ce7c2e89b5086a8d8b78d775229275292142c26476beb1b872c33 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 18 Jul 2022 14:07:36 +0000 Subject: [PATCH] Accepting request 989385 from home:dancermak:auto_update:Tumbleweed Increase compatibility with openSUSE OBS-URL: https://build.opensuse.org/request/show/989385 OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/389-ds-container?expand=0&rev=2 --- 389-ds-container.changes | 5 +++++ Dockerfile | 25 +++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/389-ds-container.changes b/389-ds-container.changes index eafc987..f3c07af 100644 --- a/389-ds-container.changes +++ b/389-ds-container.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 15 11:06:10 UTC 2022 - Dan Čermák + +- Increase compatibility with openSUSE + ------------------------------------------------------------------- Tue May 3 09:03:44 UTC 2022 - Dan Čermák diff --git a/Dockerfile b/Dockerfile index 8329785..44a3e42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,23 @@ # SPDX-License-Identifier: MIT -#!BuildTag: suse/389-ds:2.0 -#!BuildTag: suse/389-ds:latest -#!BuildTag: suse/389-ds:2.0-%RELEASE% +#!BuildTag: opensuse/389-ds:2.0 +#!BuildTag: opensuse/389-ds:latest +#!BuildTag: opensuse/389-ds:2.0-%RELEASE% FROM opensuse/tumbleweed:latest MAINTAINER wbrown@suse.de # Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.389-ds -LABEL org.opencontainers.image.title="SLE 389 Directory Server Container Image" -LABEL org.opencontainers.image.description="389 Directory Server based on the SLE Base Container Image." +# labelprefix=org.opensuse.application.389-ds +LABEL org.opencontainers.image.title="openSUSE Tumbleweed 389 Directory Server Container Image" +LABEL org.opencontainers.image.description="389 Directory Server based on the openSUSE Tumbleweed Base Container Image." LABEL org.opencontainers.image.version="2.0" -LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" +LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" -LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="registry.suse.com/suse/389-ds:2.0-%RELEASE%" +LABEL org.opencontainers.image.vendor="openSUSE Project" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/389-ds:2.0-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="techpreview" -LABEL com.suse.eula="sle-bci" -LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="beta" + +LABEL com.suse.release-stage="released" # endlabelprefix