From 39f70cdadafb7b24e353e9bd09d79dd772cbd4cc Mon Sep 17 00:00:00 2001
From: Jamie Li <tianyi.li@harness.io>
Date: Mon, 18 Oct 2021 19:00:14 -0400
Subject: [PATCH] use single build file

---
 .gitignore                           |  1 -
 build-buildah-binaries.sh            | 10 ----------
 docker/docker/Dockerfile.linux.amd64 |  6 +++---
 scripts/build.sh                     |  7 +++++++
 4 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100755 build-buildah-binaries.sh

diff --git a/.gitignore b/.gitignore
index a6c0c8c..5077f86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 release
 coverage.out
 vendor
-buildah-binaries
diff --git a/build-buildah-binaries.sh b/build-buildah-binaries.sh
deleted file mode 100755
index f445357..0000000
--- a/build-buildah-binaries.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-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 .
-
-mkdir buildah-binaries
-
-docker container create --name extract buildah-dev  
-docker container cp extract:/root/buildah/src/github.com/containers/buildah/bin ./buildah-binaries
-docker container rm -f extract
\ No newline at end of file
diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64
index 22aea7d..dbe50c7 100644
--- a/docker/docker/Dockerfile.linux.amd64
+++ b/docker/docker/Dockerfile.linux.amd64
@@ -5,7 +5,7 @@ WORKDIR /home/build
 RUN export STORAGE_DRIVER=vfs
 # Add plugin binary
 ADD release/linux/amd64/drone-docker /bin/
-ADD buildah-binaries/bin/buildah /bin/
-ADD buildah-binaries/bin/imgtype /bin/
-ADD buildah-binaries/bin/copy /bin/
+ADD release/linux/amd64/buildah /bin/
+ADD release/linux/amd64/imgtype /bin/
+ADD release/linux/amd64/copy /bin/
 ENTRYPOINT ["/bin/drone-docker"]
\ No newline at end of file
diff --git a/scripts/build.sh b/scripts/build.sh
index 655b8e8..7aaafae 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -16,3 +16,10 @@ GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-docker ./cmd/drone
 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-acr    ./cmd/drone-acr
 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 container create --name extract buildah-dev  
+docker container cp extract:/root/buildah/src/github.com/containers/buildah/bin/. release/linux/amd64/
+docker container rm -f extract
\ No newline at end of file