From fcdfc4e2026ead9385bd3b1bd56e03a3d0e696fd Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Fri, 11 Aug 2023 23:57:50 -0400 Subject: [PATCH] test --- .drone.yml | 2 +- docker/docker/Dockerfile.linux.amd64 | 46 +++++++++------------------- 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/.drone.yml b/.drone.yml index b92e60d..a976e46 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ type: docker steps: - name: build - image: golang + image: golang:alpine commands: - go test ./... - sh scripts/build.sh diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index b992d4e..d52bc0a 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,40 +1,22 @@ -FROM fedora +FROM alpine:3.18 -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 +RUN addgroup \ + -g 1000 \ + build -# Workaround - the first install somehow leaves the golang in a bad state -RUN dnf -y install golang +RUN adduser \ + -h /home/build \ + -s /bin/sh \ + -u 1000 \ + -G build \ + -D \ + build -RUN mkdir /root/buildah && \ - cd /root/buildah && \ - git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah +RUN apk add --no-cache buildah -RUN cd /root/buildah/src/github.com/containers/buildah && make && sudo make install - - - -FROM quay.io/buildah/stable:v1.23.0 +ADD release/linux/amd64/drone-docker /bin/ +ENV STORAGE_DRIVER vfs USER build 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/ - ENTRYPOINT ["/bin/drone-docker"] \ No newline at end of file