From 51c30d02d7ae2f06600a63d9be5adc370e38607a Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Sun, 2 Aug 2020 14:06:07 +0200
Subject: [PATCH] fix: gpg key import

---
 .drone.yml                                    | 29 +++++++++++++++++++
 Dockerfile                                    | 17 +++++++----
 installation-scripts/00-pacman-mirror.sh      |  6 ++++
 installation-scripts/02-github-release.sh     |  3 --
 .../{03-go-bindata.sh => 02-go-bindata.sh}    |  0
 5 files changed, 47 insertions(+), 8 deletions(-)
 delete mode 100755 installation-scripts/02-github-release.sh
 rename installation-scripts/{03-go-bindata.sh => 02-go-bindata.sh} (100%)

diff --git a/.drone.yml b/.drone.yml
index a2b5ba6..6e5bc7f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,6 +3,10 @@ type: docker
 name: build-image-x86_64
 
 steps:
+
+# BUILD
+###############################################################################
+
 - name: build-image-latest
   image: docker.io/volkerraschek/build-image:latest
   commands:
@@ -14,6 +18,9 @@ steps:
     branch:
     - master
 
+# PUSH
+###############################################################################
+
 - name: push-image-latest
   image: docker.io/volkerraschek/build-image:latest
   commands:
@@ -47,6 +54,28 @@ steps:
     event:
     - tag
 
+# NOTIFY
+###############################################################################
+
+- name: notify
+  image: drillster/drone-email
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  when:
+    status:
+    - changed
+    - failure
+
+# VOLUMES
+###############################################################################
+
 volumes:
 - name: docker_socket
   host:
diff --git a/Dockerfile b/Dockerfile
index f08f7db..f703bdb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,24 @@ ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE}
 
-COPY installation-scripts /tmp/installation-scripts
-RUN  /tmp/installation-scripts/00-pacman-mirror.sh
-
 RUN pacman --sync \
            --refresh \
            --noconfirm \
-           --sysupgrade docker go gcc make git rpm-builder which zip
+           --sysupgrade awk bash-completion docker go gcc make git which zip
+
+COPY installation-scripts /tmp/installation-scripts
+
+# Install PKGs from own repo
+RUN  /tmp/installation-scripts/00-pacman-mirror.sh
+RUN pacman --sync \
+           --refresh \
+           --noconfirm \
+           --sysupgrade rpm-builder
+
 
 ENV PATH="/root/.cargo/bin:/root/go/bin:${PATH}"
 
-RUN for f in {01-rustup.sh,02-github-release.sh,03-go-bindata.sh}; do /tmp/installation-scripts/$f; done && \
+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/installation-scripts/00-pacman-mirror.sh b/installation-scripts/00-pacman-mirror.sh
index c7aa210..eb05e92 100755
--- a/installation-scripts/00-pacman-mirror.sh
+++ b/installation-scripts/00-pacman-mirror.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+cat > /etc/pacman.d/gnupg/dirmngr.conf <<EOF
+keyserver hkps://hkps.pool.sks-keyservers.net:443
+keyserver hkp://pool.sks-keyservers.net:80
+EOF
+
 # Initialize pacman-key ring
 pacman-key --init
+pacman-key --refresh-keys
 
 # Add GPG Key
 pacman-key --recv-keys 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
diff --git a/installation-scripts/02-github-release.sh b/installation-scripts/02-github-release.sh
deleted file mode 100755
index 3b9aee4..0000000
--- a/installation-scripts/02-github-release.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-go get github.com/aktau/github-release
diff --git a/installation-scripts/03-go-bindata.sh b/installation-scripts/02-go-bindata.sh
similarity index 100%
rename from installation-scripts/03-go-bindata.sh
rename to installation-scripts/02-go-bindata.sh