From f446db6c834c63122f8d0d77ac50ab0be448ff09 Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Tue, 29 Jun 2021 13:35:28 +0200
Subject: [PATCH] Bullseye & Buster: Add Golang Binaries

---
 bullseye/x86/Dockerfile    | 3 ++-
 bullseye/x86_64/Dockerfile | 3 ++-
 buster/x86/Dockerfile      | 3 ++-
 buster/x86_64/Dockerfile   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bullseye/x86/Dockerfile b/bullseye/x86/Dockerfile
index fdd2dd2..e593f25 100644
--- a/bullseye/x86/Dockerfile
+++ b/bullseye/x86/Dockerfile
@@ -22,7 +22,8 @@ RUN groupadd -g 1000 build \
  && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
  && chown build.build /usr/local/bin
 
-USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/bullseye/x86_64/Dockerfile b/bullseye/x86_64/Dockerfile
index 82bd868..cbdd1e0 100644
--- a/bullseye/x86_64/Dockerfile
+++ b/bullseye/x86_64/Dockerfile
@@ -22,7 +22,8 @@ RUN groupadd -g 1000 build \
  && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
  && chown build.build /usr/local/bin
 
-USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/buster/x86/Dockerfile b/buster/x86/Dockerfile
index 88803e6..4908637 100644
--- a/buster/x86/Dockerfile
+++ b/buster/x86/Dockerfile
@@ -22,7 +22,8 @@ RUN groupadd -g 1000 build \
  && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
  && chown build.build /usr/local/bin
 
-USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/buster/x86_64/Dockerfile b/buster/x86_64/Dockerfile
index 49958f7..c35c29c 100644
--- a/buster/x86_64/Dockerfile
+++ b/buster/x86_64/Dockerfile
@@ -22,7 +22,8 @@ RUN groupadd -g 1000 build \
  && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
  && chown build.build /usr/local/bin
 
-USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
-- 
GitLab