diff --git a/docker/docker-nonroot/Dockerfile.linux.amd64 b/docker/docker-nonroot/Dockerfile.linux.amd64 new file mode 100644 index 0000000..70e5e72 --- /dev/null +++ b/docker/docker-nonroot/Dockerfile.linux.amd64 @@ -0,0 +1,26 @@ +# Source for dockerfile: +# https://github.com/containers/buildah/blob/master/docs/tutorials/05-openshift-rootless-bud.md +FROM redhat/ubi8-minimal + +RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ + microdnf install buildah podman && \ + microdnf clean all && \ + useradd --no-log-init -r -u 1001150000 build && \ + touch /etc/subgid /etc/subuid && \ + chmod g=u /etc/subgid /etc/subuid /etc/passwd && \ + echo build:1001150000:65536 > /etc/subuid && \ + echo build:1001150000:65536 > /etc/subgid + +# Use chroot since the default runc does not work when running rootless +RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc + +# Use VFS since fuse does not work +RUN mkdir -p /home/build/.config/containers \ + && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf + +USER build +WORKDIR /home/build + +# Add plugin binary +ADD release/linux/amd64/drone-docker /bin/ +ENTRYPOINT ["/bin/drone-docker"] diff --git a/docker/docker-nonroot/manifest.tmpl b/docker/docker-nonroot/manifest.tmpl new file mode 100644 index 0000000..10dff1d --- /dev/null +++ b/docker/docker-nonroot/manifest.tmpl @@ -0,0 +1,13 @@ +image: plugins/buildah-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - + image: plugins/buildah-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}openshift-linux-amd64 + platform: + architecture: amd64 + os: linux \ No newline at end of file diff --git a/scripts/docker.sh b/scripts/docker.sh index a28a913..9b211b0 100755 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -14,15 +14,16 @@ set -e set -x # build the binary -GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-gcr ./cmd/drone-gcr -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-gcr ./cmd/drone-gcr +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 +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 the docker image -docker build -f docker/gcr/Dockerfile.linux.amd64 -t plugins/buildah-gcr . -docker build -f docker/ecr/Dockerfile.linux.amd64 -t plugins/buildah-ecr . +docker build -f docker/gcr/Dockerfile.linux.amd64 -t plugins/buildah-gcr . +docker build -f docker/ecr/Dockerfile.linux.amd64 -t plugins/buildah-ecr . docker build -f docker/docker/Dockerfile.linux.amd64 -t plugins/buildah-docker . -docker build -f docker/acr/Dockerfile.linux.amd64 -t plugins/buildah-acr . +docker build -f docker/docker-nonroot/Dockerfile.linux.amd64 -t plugins/buildah-docker . +docker build -f docker/acr/Dockerfile.linux.amd64 -t plugins/buildah-acr . docker build -f docker/heroku/Dockerfile.linux.amd64 -t plugins/buildah-heroku .