From 57d2cc644053105a4d706ea90026451f2cabee94 Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Wed, 1 Sep 2021 08:57:34 +0200
Subject: [PATCH] fix: remove docker-pushrm

---
 Dockerfile                               | 11 ++++-------
 Makefile                                 |  2 +-
 installation-scripts/00-pacman-mirror.sh | 10 +++++-----
 installation-scripts/02-go-bindata.sh    |  3 ---
 4 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100755 installation-scripts/02-go-bindata.sh

diff --git a/Dockerfile b/Dockerfile
index be59ff0..933e9e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,14 @@ RUN pacman --sync --refresh --noconfirm --sysupgrade \
       which \
       zip
 
+# execute local files
 COPY installation-scripts /tmp/installation-scripts
+RUN for f in {00-pacman-mirror.sh,01-rustup.sh}; do /tmp/installation-scripts/$f; done && \
+    rm --recursive --force /tmp/installation-scripts
+ENV PATH="/root/.cargo/bin:/root/go/bin:${PATH}"
 
 # Install PKGs from own repo
-RUN  /tmp/installation-scripts/00-pacman-mirror.sh
 RUN pacman --sync --refresh --noconfirm --sysupgrade \
-      docker-pushrm \
       oracle-instantclient-basic \
       oracle-instantclient-jdbc \
       oracle-instantclient-odbc \
@@ -26,9 +28,4 @@ RUN pacman --sync --refresh --noconfirm --sysupgrade \
       oracle-instantclient-tools \
       rpm-builder
 
-ENV PATH="/root/.cargo/bin:/root/go/bin:${PATH}"
-
-RUN for f in {01-rustup.sh,02-go-bindata.sh}; do /tmp/installation-scripts/$f; done && \
-    rm --recursive --force /tmp/installation-scripts
-
 WORKDIR /workspace
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 58ec842..aec0cc8 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ container-image/delete:
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	${CONTAINER_RUNTIME} login ${BUILD_IMAGE_REGISTRY_HOST} --username ${BUILD_IMAGE_REGISTRY_USER} --password ${BUILD_IMAGE_REGISTRY_PASSWORD}
+	echo ${BUILD_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${BUILD_IMAGE_REGISTRY_HOST} --username ${BUILD_IMAGE_REGISTRY_USER} --password-stdin
 	${CONTAINER_RUNTIME} push ${BUILD_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
diff --git a/installation-scripts/00-pacman-mirror.sh b/installation-scripts/00-pacman-mirror.sh
index 53b90ae..8cb78bf 100755
--- a/installation-scripts/00-pacman-mirror.sh
+++ b/installation-scripts/00-pacman-mirror.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 cat > /etc/pacman.d/gnupg/dirmngr.conf <<EOF
 keyserver hkps://hkps.pool.sks-keyservers.net:443
 keyserver hkp://pool.sks-keyservers.net:80
@@ -7,19 +9,17 @@ EOF
 
 # Initialize pacman-key ring
 pacman-key --init
-pacman-key --refresh-keys
-
-# Add GPG Key
-pacman-key --recv-keys 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
-pacman-key --lsign 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
+# pacman-key --refresh-keys
 
 # Add additional pacman mirrors
 cat >> /etc/pacman.conf <<EOF
 
 [any]
+SigLevel = Optional TrustAll
 Server = https://aur.cryptic.systems/any/
 
 [x86_64]
+SigLevel = Optional TrustAll
 Server = https://aur.cryptic.systems/x86_64/
 
 [oracle]
diff --git a/installation-scripts/02-go-bindata.sh b/installation-scripts/02-go-bindata.sh
deleted file mode 100755
index b4b380a..0000000
--- a/installation-scripts/02-go-bindata.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-go get -u github.com/go-bindata/go-bindata/...
\ No newline at end of file