server: make Containerfile capable of building default or nightly

Incorporate the new shell scripts into the container build file and
use them, along with a few new build args to construct a container
image based on the given build parameters. These parameters mean
that the single Containerfile can build with our default set of
samba packages or the nightly builds.
Extending this is a matter of extending the shell scripts and
calling the build command with the proper build args.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

images/server/Containerfile

@@ -2,43 +2,29 @@ FROM quay.io/samba.org/sambacc:latest AS builder
 ARG SAMBACC_VER=master
 ARG SAMBACC_REPO=https://github.com/samba-in-kubernetes/sambacc
 
-# the changeset hash on the next line ensures we get a specifc
-# version of sambacc. When sambacc actually gets tagged, it should
-# be changed to use the tag.
+# The SAMBACC_VER value controls what version of sambacc we'll be building.
+# This can be a branch name, a tag, or a version hash.  When building tagged
+# versions of samba-containers we should use a sambacc tag.
+# SAMBACC_DISTNAME controls where the script will output a built wheel.
 RUN SAMBACC_DISTNAME=latest \
     /usr/local/bin/build.sh ${SAMBACC_VER} ${SAMBACC_REPO}
 
 FROM registry.fedoraproject.org/fedora:34
+ARG INSTALL_PACKAGES_FROM=default
+ARG SAMBA_SPECIFICS=
 
 MAINTAINER John Mulligan <[email protected]>
 
 COPY smb.conf /etc/samba/smb.conf
-RUN dnf install --setopt=install_weak_deps=False -y \
-    findutils \
-    python-pip \
-    python3-jsonschema \
-    python3-samba \
-    samba \
-    samba-client \
-    samba-winbind \
-    samba-winbind-clients \
-    tdb-tools \
-    ctdb \
-    && dnf clean all \
-    && cp --preserve=all /etc/ctdb/functions /usr/share/ctdb/functions \
-    && cp --preserve=all /etc/ctdb/notify.sh /usr/share/ctdb/notify.sh \
-    && true
+COPY install-packages.sh /usr/local/bin/install-packages.sh
+RUN /usr/local/bin/install-packages.sh "$INSTALL_PACKAGES_FROM"
 
 COPY --from=builder \
     /srv/dist/latest/sambacc-*.whl \
     /tmp/
-RUN true \
-    && wheel="$(find /tmp/ -type f -name 'sambacc-*.whl')" \
-    && [ $(echo "$wheel" | wc -l) = 1 ] \
-    && pip install "$wheel" \
-    && rm -f "$wheel" \
-    && ln -s /usr/local/share/sambacc/examples/minimal.json /etc/samba/container.json \
-    && true
+COPY install-sambacc.sh /usr/local/bin/install-sambacc.sh
+RUN /usr/local/bin/install-sambacc.sh \
+    "/tmp" "/usr/local/share/sambacc/examples/minimal.json"
 
 
 VOLUME ["/share"]
@@ -47,6 +33,7 @@ EXPOSE 445
 
 ENV SAMBACC_CONFIG="/etc/samba/container.json:/etc/samba/users.json"
 ENV SAMBA_CONTAINER_ID="demo"
+ENV SAMBA_SPECIFICS="$SAMBA_SPECIFICS"
 ENTRYPOINT ["samba-container"]
 CMD ["run", "smbd"]