From 18083e6891e4e337c93632cf13850dca90ac4767 Mon Sep 17 00:00:00 2001
From: Henrik Triem <henrik.triem@netways.de>
Date: Wed, 4 May 2022 17:09:31 +0200
Subject: [PATCH] Change permissions for Bionic specifically

---
 bionic/x86/Dockerfile    | 3 +--
 bionic/x86_64/Dockerfile | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index dbb4b4c..403cc2b 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
  && eatmydata apt-get upgrade -y
 
 RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
+  sudo wget curl tar expect git-man=1:2.17.0-1ubuntu1 git=1:2.17.0-1ubuntu1 \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
@@ -22,7 +22,6 @@ RUN groupadd -g 1000 build \
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go 386
-RUN git config --global --add safe.directory '*'
 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 7da9c94..ea97b9f 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
  && eatmydata apt-get upgrade -y
 
 RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
+  sudo wget curl tar expect git-man=1:2.17.0-1ubuntu1 git=1:2.17.0-1ubuntu1 \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils golang-1.11-go
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
@@ -30,7 +30,6 @@ RUN groupadd -g 1000 build \
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go
-RUN git config --global --add safe.directory '*'
 USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
-- 
GitLab