use single build file

.gitignore

@@ -1,4 +1,3 @@
 release
 coverage.out
 vendor
-buildah-binaries

build-buildah-binaries.sh

@@ -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

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"]

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