diff --git a/Dockerfile-build-buildah b/Dockerfile-build-buildah index 4a1fe36..e91cb72 100644 --- a/Dockerfile-build-buildah +++ b/Dockerfile-build-buildah @@ -20,12 +20,6 @@ RUN dnf -y install \ # Workaround - the first install somehow leaves the golang in a bad state RUN dnf -y install golang -ARG GIT_USER_NAME -RUN git config --global user.name "$GIT_USER_NAME" - -ARG GIT_USER_EMAIL -RUN git config --global user.email "$GIT_USER_EMAIL" - RUN mkdir /root/buildah && \ cd /root/buildah && \ git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index e82115a..dbe50c7 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,33 +1,3 @@ -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 @@ -35,5 +5,7 @@ WORKDIR /home/build RUN export STORAGE_DRIVER=vfs # Add plugin binary ADD release/linux/amd64/drone-docker /bin/ -COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /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