From 71af02818a51256181b4c4954323de17f7356437 Mon Sep 17 00:00:00 2001
From: Jamie Li <tianyi.li@harness.io>
Date: Tue, 19 Oct 2021 12:41:00 -0400
Subject: [PATCH] remove git username password

---
 docker/docker/Dockerfile.linux.amd64 | 34 +++++++++++++++++++++++++---
 scripts/build.sh                     |  3 +--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64
index dbe50c7..e82115a 100644
--- a/docker/docker/Dockerfile.linux.amd64
+++ b/docker/docker/Dockerfile.linux.amd64
@@ -1,3 +1,33 @@
+FROM fedora
+
+RUN dnf -y install \
+    make \
+    golang \
+    bats \
+    btrfs-progs-devel \
+    device-mapper-devel \
+    glib2-devel \
+    gpgme-devel \
+    libassuan-devel \
+    libseccomp-devel \
+    git \
+    bzip2 \
+    go-md2man \
+    runc \
+    containers-common \
+    skopeo-containers
+
+# Workaround - the first install somehow leaves the golang in a bad state
+RUN dnf -y install golang
+
+RUN mkdir /root/buildah && \
+    cd /root/buildah && \
+    git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah
+
+RUN cd /root/buildah/src/github.com/containers/buildah && make && sudo make install
+
+
+
 FROM quay.io/buildah/stable:v1.23.0
 
 USER build
@@ -5,7 +35,5 @@ WORKDIR /home/build
 RUN export STORAGE_DRIVER=vfs
 # Add plugin binary
 ADD release/linux/amd64/drone-docker /bin/
-ADD release/linux/amd64/buildah /bin/
-ADD release/linux/amd64/imgtype /bin/
-ADD release/linux/amd64/copy /bin/
+COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
 ENTRYPOINT ["/bin/drone-docker"]
\ No newline at end of file
diff --git a/scripts/build.sh b/scripts/build.sh
index 7aaafae..f0a4525 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -17,8 +17,7 @@ GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-acr    ./cmd/drone
 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-heroku   ./cmd/drone-heroku
 
 #build buildah binaries
-docker build --build-arg=GIT_USER_NAME="$(git config user.name)" --build-arg=GIT_USER_EMAIL="$(git config user.email)" \
-    -f Dockerfile-build-buildah -t buildah-dev .
+docker build -f Dockerfile-build-buildah -t buildah-dev .
 
 docker container create --name extract buildah-dev  
 docker container cp extract:/root/buildah/src/github.com/containers/buildah/bin/. release/linux/amd64/