images: fix and polish the suse image builds

Signed-off-by: Michael Adam <obnox@samba.org>

Author: obnoxxx

Containerfile.suse

@@ -18,13 +18,11 @@ COPY common.sh /usr/local/bin/common.sh
 RUN chmod +x /usr/local/bin/verify.sh
 COPY  "${INSTALL_SCRIPT}" /usr/local/bin/install-packages.sh
 RUN chmod +x /usr/local/bin/install-packages.sh
-# Set a sane PATH during installation.
-ENV PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin"
-# install, fix, and verify in ONE ATOMIC STEP
+# Set a sane PATH during installation:
+ENV PATH="/usr/local/bin:/usr/bin:/bin:/sbin:/usr/local/sbin:/usr/sbin"
+# install and verify in one ATOMIC STEP:
 RUN true && \
 /usr/local/bin/install-packages.sh && \
-echo "Restoring symlinks if broken..." && \
-( [ -L /bin ] || (mv /bin/* /usr/bin/ && rm -rf /bin && ln -s usr/bin /bin) ) && \
 echo "Verifying binaries before layer commit..." && \
 /usr/local/bin/verify.sh && \
 echo "your buildbox is ready."

install-packages_suse_c.sh

@@ -2,7 +2,6 @@
 
 set -euo pipefail
 
-
 		zypper install  -y git gcc make cmake automake autoconf python3 vim less && \
 		sync
 

install-packages_suse_latex.sh

@@ -1,25 +1,41 @@
 #!/usr/bin/env bash
 
+		set -euo pipefail
+
+		zypper  install  -y git make cmake  texlive-beamer \
+		texlive-dvips \
+		texlive-amscls \
+		texlive-amsaddr \
+		texlive-amsfonts \
+		texlive-amscdx \
+		texlive-amslatex-primer \
+		texlive-amsmath \
+		texlive-amsrefs \
+		texlive-amstex \
+		texlive-xypic \
+		texlive-bibtex \
+		texlive-imakeidx \
+		texlive-makeindex \
+		texlive-latex-uni8 \
+		texlive-ginpenc \
+		texlive-german \
+		texlive-hyperxmp \
+		texlive-fancyhdr \
+		ghostscript vim less dia && \
+		sync
+
+		RC=$?
+		echo "DONE installing packages"
+		echo "return code: ${RC}"
+
+		if [ ${RC} -eq 0 ]; then
+				echo "SUCCESSfully installed packages."
+		else
+				echo "ERROR installing packages."
+		fi
+
+
+		exit ${RC}
 
-zypper  install  -y git make cmake  texlive-beamer \
-	texlive-dvips \
-	texlive-amscls \
-	texlive-amsaddr \
-	texlive-amsfonts \
-	texlive-amscdx \
-	texlive-amslatex-primer \
-	texlive-amsmath \
-	texlive-amsrefs \
-	texlive-amstex \
-	texlive-xypic \
-	texlive-bibtex \
-	texlive-imakeidx \
-	texlive-makeindex \
-	texlive-latex-uni8 \
-	texlive-ginpenc \
-	texlive-german \
-	texlive-hyperxmp \
-	texlive-fancyhdr \
-	ghostscript vim less dia