Accepting request 1064318 from network:samba:CONTAINERS

- 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/request/show/1064318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba-server?expand=0&rev=2

Dockerfile

@@ -4,15 +4,18 @@
 #!BuildTag: opensuse/samba-server:%%PKG_VERSION%%
 #!BuildTag: opensuse/samba-server:%%PKG_VERSION%%-%RELEASE%
 
+# OBS doesn't allow a fully qualified image registry name for the offline build
 FROM opensuse/tumbleweed
-LABEL maintainer="David Mulder <dmulder@suse.com>"
+ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command
+
+MAINTAINER David Mulder <dmulder@suse.com>
 
 # labelprefix=org.opensuse.samba-server
 LABEL org.opencontainers.image.title="Samba container"
 LABEL org.opencontainers.image.description="Samba 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-server:%%PKG_VERSION%%-%RELEASE%"
 # endlabelprefix
@@ -28,9 +31,10 @@ RUN zypper --non-interactive install --no-recommends \
   samba-winbind \
   tdb-tools \
   ctdb \
-  sambacc
+  glibc \
+  sambacc && \
+  zypper clean;
 RUN ln -sf /usr/share/sambacc/examples/minimal.json /etc/samba/container.json
-COPY nsswitch.conf /etc/nsswitch.conf
 
 
 VOLUME ["/share"]
@@ -39,7 +43,7 @@ EXPOSE 445
 
 ENV SAMBACC_CONFIG="/etc/samba/container.json:/etc/samba/users.json"
 ENV SAMBA_CONTAINER_ID="demo"
-ENV SAMBA_SPECIFICS="daemon_cli_debug_output"
+ENV SAMBA_SPECIFICS="$SAMBA_SPECIFICS"
 ENTRYPOINT ["samba-container"]
 CMD ["run", "smbd"]
 

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
-    <param name="url">https://github.com/openSUSE/samba-container.git</param>
+    <param name="url">https://github.com/samba-in-kubernetes/samba-container.git</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">samba-container</param>
@@ -9,13 +9,12 @@
   </service>
   <service name="extract_file" mode="disabled">
     <param name="archive">*.tar</param>
-    <param name="files">*/images/server/Containerfile</param>
+    <param name="files">*/images/server/Containerfile.opensuse</param>
     <param name="outfilename">Dockerfile</param>
   </service>
   <service name="extract_file" mode="disabled">
     <param name="archive">*.tar</param>
-    <param name="files">*/images/server/nsswitch.conf
+    <param name="files">*/images/server/smb.conf
-                        */images/server/smb.conf
                         */LICENSE
     </param>
   </service>

_servicedata

@@ -1,4 +1,9 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/openSUSE/samba-container.git</param>
-              <param name="changesrevision">924c983f879afa0ecc8daed3af737f660b84052c</param></service></servicedata>
+    <param name="changesrevision">924c983f879afa0ecc8daed3af737f660b84052c</param></service>
+  <service name="tar_scm">
+    <param name="url">https://github.com/samba-in-kubernetes/samba-container.git</param>
+    <param name="changesrevision">94e313043630982eee3d2e63b37038c487f4290b</param>
+  </service>
+</servicedata>

nsswitch.conf

@@ -1,3 +0,0 @@
-passwd:		compat
-group:		compat
-shadow:		compat

samba-server.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Feb 10 16:37:22 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 15:31:46 UTC 2023 - dmulder@suse.com