From 7a67dc249a4e75459e4b205b716ad5abf9d7faa1ead9e88fd375dc9fd3aec26b Mon Sep 17 00:00:00 2001 From: David Mulder Date: Fri, 10 Feb 2023 17:24:14 +0000 Subject: [PATCH] - Update to version 1675868083.94e3130: * toolbox: Add openSUSE specific Containerfile * toolbox: Make Containerfile Fedora specific * client: Add openSUSE specific Containerfile * client: Make Containerfile Fedora specific * ad-server: Add openSUSE specific Containerfile * ad-server: Make Containerfile Fedora specific * server: Add openSUSE specific Containerfile * server: Make Containerfile Fedora specific * github: fix minor "spelling" mistake in mergify rules * workflows: Share samba-client image for building toolbox OBS-URL: https://build.opensuse.org/package/show/network:samba:CONTAINERS/samba-client?expand=0&rev=4 --- Dockerfile | 8 ++++---- _service | 4 ++-- _servicedata | 12 ++++++++---- samba-client.changes | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63f4364..1f065fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,21 @@ -# Copyright 2020 Michael Adam # Defines the tag for OBS and build script builds: #!BuildTag: opensuse/samba-client:latest #!BuildTag: opensuse/samba-client:%%MINOR%% #!BuildTag: opensuse/samba-client:%%PKG_VERSION%% #!BuildTag: opensuse/samba-client:%%PKG_VERSION%%-%RELEASE% +# OBS doesn't allow a fully qualified image registry name for the offline build FROM opensuse/tumbleweed -LABEL maintainer="David Mulder " +MAINTAINER David Mulder # labelprefix=org.opensuse.samba-client LABEL org.opencontainers.image.title="Samba Client container" LABEL org.opencontainers.image.description="Samba Client container" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%" -LABEL org.opencontainers.image.vendor="openSUSE Project" +LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-client:%%PKG_VERSION%%-%RELEASE%" # endlabelprefix -RUN zypper --non-interactive install --no-recommends samba-client +RUN zypper --non-interactive install --no-recommends samba-client && zypper clean diff --git a/_service b/_service index 5762102..95ff349 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ git - https://github.com/openSUSE/samba-container.git + https://github.com/samba-in-kubernetes/samba-container.git master enable samba-container @@ -9,7 +9,7 @@ *.tar - */images/client/Containerfile + */images/client/Containerfile.opensuse Dockerfile diff --git a/_servicedata b/_servicedata index cb18b42..aa1ef75 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,10 @@ - - https://github.com/openSUSE/samba-container.git - 602a44991137144e1cda297069fdb961268ef499 - + + https://github.com/openSUSE/samba-container.git + 602a44991137144e1cda297069fdb961268ef499 + + + https://github.com/samba-in-kubernetes/samba-container.git + 94e313043630982eee3d2e63b37038c487f4290b + diff --git a/samba-client.changes b/samba-client.changes index 4381c65..4d94b19 100644 --- a/samba-client.changes +++ b/samba-client.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Feb 10 17:22:27 UTC 2023 - dmulder@suse.com + +- Update to version 1675868083.94e3130: + * toolbox: Add openSUSE specific Containerfile + * toolbox: Make Containerfile Fedora specific + * client: Add openSUSE specific Containerfile + * client: Make Containerfile Fedora specific + * ad-server: Add openSUSE specific Containerfile + * ad-server: Make Containerfile Fedora specific + * server: Add openSUSE specific Containerfile + * server: Make Containerfile Fedora specific + * github: fix minor "spelling" mistake in mergify rules + * workflows: Share samba-client image for building toolbox + ------------------------------------------------------------------- Tue Jan 31 14:54:00 UTC 2023 - David Mulder