third/plugin-drone-buildah
1
0
Fork 0
mirror of https://github.com/drone-plugins/drone-buildah.git synced 2026-06-26 15:52:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [CI-23168]: Use single-stage buildah base in plugin Dockerfiles to fix glibc/libdevmapper symbol errors

Browse Source
This commit is contained in:
Devansh Mathur
2026-06-18 15:22:46 +05:30
parent 93204d0eac
commit f4d53929aa
5 changed files with 15 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/acr/Dockerfile.linux.amd64
+4 -2
View File
@@ -1,6 +1,6 @@
# Source for dockerfile:
# https://github.com/containers/buildah/blob/master/docs/tutorials/05-openshift-rootless-bud.md
FROM quay.io/buildah/stable:v1.14.8
FROM quay.io/buildah/stable:v1.43.1
RUN touch /etc/subgid /etc/subuid \
&& chmod g=u /etc/subgid /etc/subuid /etc/passwd \
@@ -16,8 +16,10 @@ RUN mkdir -p /home/build/.config/containers \
USER build
WORKDIR /home/build
ENV STORAGE_DRIVER=vfs
ENV BUILDAH_ISOLATION=chroot
# Add plugin binary
# Add plugin binaries
ADD release/linux/amd64/drone-docker /bin/
ADD release/linux/amd64/drone-acr /bin/
ENTRYPOINT ["/bin/drone-acr"]
docker/docker/Dockerfile.linux.amd64
+2 -2
View File
@@ -1,9 +1,9 @@
FROM quay.io/buildah/stable:v1.36.0
FROM quay.io/buildah/stable:v1.43.1
# Set up the working directory
USER build
WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
ENV STORAGE_DRIVER=vfs
# Add the plugin binary
ADD release/linux/amd64/drone-docker /bin/
docker/ecr/Dockerfile.linux.amd64
+3 -34
View File
@@ -1,41 +1,10 @@
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
FROM quay.io/buildah/stable:v1.43.1
USER build
WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
ENV STORAGE_DRIVER=vfs
# Add plugin binary
# Add plugin binaries
ADD release/linux/amd64/drone-docker /bin/
ADD release/linux/amd64/drone-ecr /bin/
ENTRYPOINT ["/bin/drone-ecr"]
docker/gcr/Dockerfile.linux.amd64
+3 -34
View File
@@ -1,41 +1,10 @@
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
FROM quay.io/buildah/stable:v1.43.1
USER build
WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
ENV STORAGE_DRIVER=vfs
# Add plugin binary
# Add plugin binaries
ADD release/linux/amd64/drone-docker /bin/
ADD release/linux/amd64/drone-gcr /bin/
ENTRYPOINT ["/bin/drone-gcr"]
docker/heroku/Dockerfile.linux.amd64
+3 -34
View File
@@ -1,41 +1,10 @@
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
FROM quay.io/buildah/stable:v1.43.1
USER build
WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
ENV STORAGE_DRIVER=vfs
# Add plugin binary
# Add plugin binaries
ADD release/linux/amd64/drone-docker /bin/
ADD release/linux/amd64/drone-heroku /bin/
ENTRYPOINT ["/bin/drone-heroku"]