From 603e9ab2a0492f2275f5e8930832f7cb573ddaaae94233065467db8010c52213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Wed, 23 Nov 2022 09:32:05 +0000
Subject: [PATCH] [info=61d0c60fdc04ce7ecbb04d88ea3a303b]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/389-ds-container?expand=0&rev=3
---
 Dockerfile    | 22 ++++++++++------------
 _service      |  7 ++++++-
 nsswitch.conf | 22 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 nsswitch.conf

diff --git a/Dockerfile b/Dockerfile
index 44a3e42..85bb1c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,33 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: opensuse/389-ds:2.0
+#!BuildTag: opensuse/389-ds:%%389ds_version%%
 #!BuildTag: opensuse/389-ds:latest
-#!BuildTag: opensuse/389-ds:2.0-%RELEASE%
+#!BuildTag: opensuse/389-ds:%%389ds_version%%-%RELEASE%
+
 FROM opensuse/tumbleweed:latest
 
-MAINTAINER wbrown@suse.de
+MAINTAINER william.brown@suse.com
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # 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.version="%%389ds_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/389-ds:2.0-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/389-ds:%%389ds_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-
-RUN set -euo pipefail; zypper -n in --no-recommends 389-ds timezone openssl; zypper -n clean; rm -rf /var/log/*
-
-
-
+RUN set -euo pipefail; zypper -n in --no-recommends 389-ds timezone openssl nss_synth; zypper -n clean; rm -rf /var/log/*
 CMD ["/usr/lib/dirsrv/dscontainer", "-r"]
+VOLUME /data
 EXPOSE 3389 3636
 
+COPY nsswitch.conf /etc/nsswitch.conf
+
 RUN set -euo pipefail; mkdir -p /data/config; \
     mkdir -p /data/ssca; \
     mkdir -p /data/run; \
@@ -36,7 +36,5 @@ RUN set -euo pipefail; mkdir -p /data/config; \
     ln -s /data/ssca /etc/dirsrv/ssca; \
     ln -s /data/run /var/run/dirsrv
 
-VOLUME /data
-
 HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \
     CMD /usr/lib/dirsrv/dscontainer -H
diff --git a/_service b/_service
index 52b4539..b74ff88 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,10 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="docker_label_helper"/>
-
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%389ds_version%%</param>
+    <param name="package">389-ds</param>
+    <param name="parse-version">minor</param>
+  </service>
 </services>
\ No newline at end of file
diff --git a/nsswitch.conf b/nsswitch.conf
new file mode 100644
index 0000000..879196b
--- /dev/null
+++ b/nsswitch.conf
@@ -0,0 +1,22 @@
+passwd:		compat synth
+group:		compat synth
+shadow:		compat
+# Allow initgroups to default to the setting for group.
+# initgroups:	compat
+
+hosts:  	files dns
+networks:	files dns
+
+aliases:	files usrfiles
+ethers:		files usrfiles
+gshadow:	files usrfiles
+netgroup:	files nis
+protocols:	files usrfiles
+publickey:	files
+rpc:		files usrfiles
+services:	files usrfiles
+
+automount:	files nis
+bootparams:	files
+netmasks:	files
+