From 5a6255649f61abf2331499cae4d39f6d20f04bff Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Wed, 30 Jun 2021 13:24:43 +0200
Subject: [PATCH] Add Golang binaries to relevent releases

---
 bionic/x86/Dockerfile     | 3 ++-
 bionic/x86_64/Dockerfile  | 3 ++-
 focal/x86_64/Dockerfile   | 3 ++-
 groovy/x86_64/Dockerfile  | 3 ++-
 hirsute/x86_64/Dockerfile | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index 315a2b2..8a3f176 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -20,7 +20,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/bionic/x86_64/Dockerfile b/bionic/x86_64/Dockerfile
index ba9a234..44ecba2 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -28,7 +28,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/focal/x86_64/Dockerfile b/focal/x86_64/Dockerfile
index 433d1c6..d6af05d 100644
--- a/focal/x86_64/Dockerfile
+++ b/focal/x86_64/Dockerfile
@@ -20,7 +20,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/groovy/x86_64/Dockerfile b/groovy/x86_64/Dockerfile
index 2c817df..0aad3ca 100644
--- a/groovy/x86_64/Dockerfile
+++ b/groovy/x86_64/Dockerfile
@@ -20,7 +20,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/hirsute/x86_64/Dockerfile b/hirsute/x86_64/Dockerfile
index a9993a7..4a88d66 100644
--- a/hirsute/x86_64/Dockerfile
+++ b/hirsute/x86_64/Dockerfile
@@ -20,7 +20,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