From 6d4ce8c5ac269ff99226de4b17826150b511246a Mon Sep 17 00:00:00 2001 From: Jamie Li Date: Tue, 19 Oct 2021 13:20:58 -0400 Subject: [PATCH] two stage --- Dockerfile-build-buildah | 27 --------------------- docker/docker/Dockerfile.linux.amd64 | 35 +++++++++++++++++++++++++--- scripts/build.sh | 9 +------ 3 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 Dockerfile-build-buildah diff --git a/Dockerfile-build-buildah b/Dockerfile-build-buildah deleted file mode 100644 index e91cb72..0000000 --- a/Dockerfile-build-buildah +++ /dev/null @@ -1,27 +0,0 @@ -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 diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index dbe50c7..b992d4e 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,6 @@ 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 f0a4525..e333c72 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,11 +14,4 @@ GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-gcr ./cmd/drone GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-ecr ./cmd/drone-ecr GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-docker ./cmd/drone-docker 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 -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 +GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-heroku ./cmd/drone-heroku \ No newline at end of file