Compare commits

..

No commits in common. "master" and "v1.1.0" have entirely different histories.

9 changed files with 228 additions and 222 deletions

View File

@ -1,28 +1,173 @@
kind: pipeline kind: pipeline
name: default
type: docker type: docker
name: default
steps: steps:
- name: build - name: build
image: golang:alpine image: golang
commands: commands:
- go test ./... - go test ./...
- sh scripts/build.sh - sh scripts/build.sh
- name: docker - name: docker
image: plugins/docker image: plugins/docker
settings: settings:
repo: cr.smcm.xyz/drone-plugins/buildah repo: plugins/buildah-docker
tags: auto_tag: true
- latest auto_tag_suffix: linux-amd64
- ${DRONE_COMMIT_SHA} daemon_off: false
daemon_off: true dockerfile: docker/docker/Dockerfile.linux.amd64
dockerfile: docker/docker/Dockerfile.linux.amd64 username:
cache_from: cr.smcm.xyz/drone-plugins/buildah from_secret: docker_username
password:
from_secret: docker_password
when:
event:
exclude:
- pull_request
- name: gcr
image: plugins/docker
settings:
repo: plugins/buildah-gcr
auto_tag: true
auto_tag_suffix: linux-amd64
daemon_off: false
dockerfile: docker/gcr/Dockerfile.linux.amd64
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
event:
exclude:
- pull_request
- name: ecr
image: plugins/docker
settings:
repo: plugins/buildah-ecr
auto_tag: true
auto_tag_suffix: linux-amd64
daemon_off: false
dockerfile: docker/ecr/Dockerfile.linux.amd64
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
event:
exclude:
- pull_request
- name: acr
image: plugins/docker
settings:
repo: plugins/buildah-acr
auto_tag: true
auto_tag_suffix: linux-amd64
daemon_off: false
dockerfile: docker/acr/Dockerfile.linux.amd64
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
event:
exclude:
- pull_request
- name: heroku
image: plugins/docker
settings:
repo: plugins/buildah-heroku
auto_tag: true
auto_tag_suffix: linux-amd64
daemon_off: false
dockerfile: docker/heroku/Dockerfile.linux.amd64
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
event:
exclude:
- pull_request
---
kind: pipeline
type: docker
name: notifications-docker
platform:
os: linux
arch: amd64
steps:
- name: manifest-docker
pull: always
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: docker_password
spec: docker/docker/manifest.tmpl
username:
from_secret: docker_username
- name: manifest-gcr
pull: always
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: docker_password
spec: docker/gcr/manifest.tmpl
username:
from_secret: docker_username
- name: manifest-ecr
pull: always
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: docker_password
spec: docker/ecr/manifest.tmpl
username:
from_secret: docker_username
- name: manifest-acr
pull: always
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: docker_password
spec: docker/acr/manifest.tmpl
username:
from_secret: docker_username
- name: manifest-heroku
pull: always
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: docker_password
spec: docker/heroku/manifest.tmpl
username:
from_secret: docker_username
trigger: trigger:
branch: master ref:
event: - refs/heads/master
- push - "refs/tags/**"
- custom
- cron depends_on:
- default

View File

@ -8,7 +8,7 @@
[![Go Doc](https://godoc.org/github.com/drone-plugins/drone-buildah?status.svg)](http://godoc.org/github.com/drone-plugins/drone-buildah) [![Go Doc](https://godoc.org/github.com/drone-plugins/drone-buildah?status.svg)](http://godoc.org/github.com/drone-plugins/drone-buildah)
[![Go Report](https://goreportcard.com/badge/github.com/drone-plugins/drone-buildah)](https://goreportcard.com/report/github.com/drone-plugins/drone-buildah) [![Go Report](https://goreportcard.com/badge/github.com/drone-plugins/drone-buildah)](https://goreportcard.com/report/github.com/drone-plugins/drone-buildah)
Drone plugin uses buildah to build and publish Docker images to a container registry. For the usage information and a listing of the available options please take a look at [the docs](https://plugins.drone.io/plugins/buildah). Drone plugin uses buildah to build and publish Docker images to a container registry. For the usage information and a listing of the available options please take a look at [the docs](http://plugins.drone.io/drone-plugins/drone-buildah/).
## Build ## Build
@ -66,6 +66,7 @@ docker run --rm \
-e PLUGIN_REPO=octocat/hello-world \ -e PLUGIN_REPO=octocat/hello-world \
-e DRONE_COMMIT_SHA=d8dbe4d94f15fe89232e0402c6e8a0ddf21af3ab \ -e DRONE_COMMIT_SHA=d8dbe4d94f15fe89232e0402c6e8a0ddf21af3ab \
--cap-add=SYS_ADMIN \ --cap-add=SYS_ADMIN \
-v /var/lib/containers/:/var/lib/containers/:Z \
-v $(pwd):$(pwd) \ -v $(pwd):$(pwd) \
-w $(pwd) \ -w $(pwd) \
plugins/buildah-docker --dry-run plugins/buildah-docker --dry-run

View File

@ -182,46 +182,6 @@ func main() {
Usage: "additional host:IP mapping", Usage: "additional host:IP mapping",
EnvVar: "PLUGIN_ADD_HOST", EnvVar: "PLUGIN_ADD_HOST",
}, },
cli.StringFlag{
Name: "s3-local-cache-dir",
Usage: "local directory for S3 based cache",
EnvVar: "PLUGIN_S3_LOCAL_CACHE_DIR",
},
cli.StringFlag{
Name: "s3-bucket",
Usage: "S3 bucket name",
EnvVar: "PLUGIN_S3_BUCKET",
},
cli.StringFlag{
Name: "s3-endpoint",
Usage: "S3 endpoint address",
EnvVar: "PLUGIN_S3_ENDPOINT",
},
cli.StringFlag{
Name: "s3-region",
Usage: "S3 region",
EnvVar: "PLUGIN_S3_REGION",
},
cli.StringFlag{
Name: "s3-key",
Usage: "S3 access key",
EnvVar: "PLUGIN_S3_ACCESS_KEY",
},
cli.StringFlag{
Name: "s3-secret",
Usage: "S3 access secret",
EnvVar: "PLUGIN_S3_SECRET",
},
cli.BoolFlag{
Name: "s3-use-ssl",
Usage: "Enable SSL for S3 connections",
EnvVar: "PLUGIN_S3_USE_SSL",
},
cli.BoolFlag{
Name: "layers",
Usage: "User Layers",
EnvVar: "PLUGIN_LAYERS",
},
} }
if err := app.Run(os.Args); err != nil { if err := app.Run(os.Args); err != nil {
@ -261,14 +221,6 @@ func run(c *cli.Context) error {
NoCache: c.Bool("no-cache"), NoCache: c.Bool("no-cache"),
AddHost: c.StringSlice("add-host"), AddHost: c.StringSlice("add-host"),
Quiet: c.Bool("quiet"), Quiet: c.Bool("quiet"),
S3CacheDir: c.String("s3-local-cache-dir"),
S3Bucket: c.String("s3-bucket"),
S3Endpoint: c.String("s3-endpoint"),
S3Region: c.String("s3-region"),
S3Key: c.String("s3-key"),
S3Secret: c.String("s3-secret"),
S3UseSSL: c.Bool("s3-use-ssl"),
Layers: c.Bool("layers"),
}, },
} }

View File

@ -45,14 +45,6 @@ type (
NoCache bool // Docker build no-cache NoCache bool // Docker build no-cache
AddHost []string // Docker build add-host AddHost []string // Docker build add-host
Quiet bool // Docker build quiet Quiet bool // Docker build quiet
S3CacheDir string
S3Bucket string
S3Endpoint string
S3Region string
S3Key string
S3Secret string
S3UseSSL bool
Layers bool
} }
// Plugin defines the Docker plugin parameters. // Plugin defines the Docker plugin parameters.
@ -198,7 +190,6 @@ func commandInfo() *exec.Cmd {
func commandBuild(build Build) *exec.Cmd { func commandBuild(build Build) *exec.Cmd {
args := []string{ args := []string{
"bud", "bud",
"--storage-driver", "vfs",
"-f", build.Dockerfile, "-f", build.Dockerfile,
} }
@ -232,30 +223,6 @@ func commandBuild(build Build) *exec.Cmd {
if build.Quiet { if build.Quiet {
args = append(args, "--quiet") args = append(args, "--quiet")
} }
if build.Layers {
args = append(args, "--layers=true")
if build.S3CacheDir != "" {
args = append(args, "--s3-local-cache-dir", build.S3CacheDir)
if build.S3Bucket != "" {
args = append(args, "--s3-bucket", build.S3Bucket)
}
if build.S3Endpoint != "" {
args = append(args, "--s3-endpoint", build.S3Endpoint)
}
if build.S3Region != "" {
args = append(args, "--s3-region", build.S3Region)
}
if build.S3Key != "" {
args = append(args, "--s3-key", build.S3Key)
}
if build.S3Secret != "" {
args = append(args, "--s3-secret", build.S3Secret)
}
if build.S3UseSSL {
args = append(args, "--s3-use-ssl=true")
}
}
}
if build.AutoLabel { if build.AutoLabel {
labelSchema := []string{ labelSchema := []string{
@ -336,14 +303,14 @@ func commandTag(build Build, tag string) *exec.Cmd {
target = fmt.Sprintf("%s:%s", build.Repo, tag) target = fmt.Sprintf("%s:%s", build.Repo, tag)
) )
return exec.Command( return exec.Command(
buildahExe, "tag", "--storage-driver", "vfs", source, target, buildahExe, "tag", source, target,
) )
} }
// helper function to create the docker push command. // helper function to create the docker push command.
func commandPush(build Build, tag string) *exec.Cmd { func commandPush(build Build, tag string) *exec.Cmd {
target := fmt.Sprintf("%s:%s", build.Repo, tag) target := fmt.Sprintf("%s:%s", build.Repo, tag)
return exec.Command(buildahExe, "push", "--storage-driver", "vfs", target) return exec.Command(buildahExe, "push", target)
} }
// helper to check if args match "docker prune" // helper to check if args match "docker prune"
@ -357,7 +324,7 @@ func isCommandRmi(args []string) bool {
} }
func commandRmi(tag string) *exec.Cmd { func commandRmi(tag string) *exec.Cmd {
return exec.Command(buildahExe, "--storage-driver", "vfs", "rmi", tag) return exec.Command(buildahExe, "rmi", tag)
} }
// trace writes each command to stdout with the command wrapped in an xml // trace writes each command to stdout with the command wrapped in an xml

View File

@ -1,28 +1,22 @@
FROM alpine:3.18 # 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
RUN addgroup \ RUN touch /etc/subgid /etc/subuid \
-g 1000 \ && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
build && echo build:10000:65536 > /etc/subuid \
&& echo build:10000:65536 > /etc/subgid
RUN adduser \ # Use chroot since the default runc does not work when running rootless
-h /home/build \ RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
-s /bin/sh \
-u 1000 \
-G build \
-D \
build
RUN echo -e "build:1:999\nbuild:1001:64535" > /etc/subuid && \ # Use VFS since fuse does not work
echo -e "build:1:999\nbuild:1001:64535" > /etc/subgid && \ RUN mkdir -p /home/build/.config/containers \
mkdir -p /home/build/.local/share/containers && \ && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
mkdir -p /home/build/.config/containers && \
chown -R build:build /home/build
RUN apk add --no-cache buildah
ADD release/linux/amd64/drone-docker /bin/
ENV STORAGE_DRIVER vfs
USER build USER build
WORKDIR /home/build WORKDIR /home/build
# Add plugin binary
ADD release/linux/amd64/drone-docker /bin/
ENTRYPOINT ["/bin/drone-docker"] ENTRYPOINT ["/bin/drone-docker"]

View File

@ -1,39 +1,21 @@
FROM fedora # 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
RUN dnf -y install \ RUN touch /etc/subgid /etc/subuid \
make \ && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
golang \ && echo build:10000:65536 > /etc/subuid \
bats \ && echo build:10000:65536 > /etc/subgid
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 # Use chroot since the default runc does not work when running rootless
RUN dnf -y install golang RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
RUN mkdir /root/buildah && \ # Use VFS since fuse does not work
cd /root/buildah && \ RUN mkdir -p /home/build/.config/containers \
git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
RUN cd /root/buildah/src/github.com/containers/buildah && make && sudo make install
FROM quay.io/buildah/stable:v1.23.0
USER build USER build
WORKDIR /home/build WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
# Add plugin binary # Add plugin binary
ADD release/linux/amd64/drone-docker /bin/ ADD release/linux/amd64/drone-docker /bin/

View File

@ -1,39 +1,21 @@
FROM fedora # 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
RUN dnf -y install \ RUN touch /etc/subgid /etc/subuid \
make \ && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
golang \ && echo build:10000:65536 > /etc/subuid \
bats \ && echo build:10000:65536 > /etc/subgid
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 # Use chroot since the default runc does not work when running rootless
RUN dnf -y install golang RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
RUN mkdir /root/buildah && \ # Use VFS since fuse does not work
cd /root/buildah && \ RUN mkdir -p /home/build/.config/containers \
git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
RUN cd /root/buildah/src/github.com/containers/buildah && make && sudo make install
FROM quay.io/buildah/stable:v1.23.0
USER build USER build
WORKDIR /home/build WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
# Add plugin binary # Add plugin binary
ADD release/linux/amd64/drone-docker /bin/ ADD release/linux/amd64/drone-docker /bin/

View File

@ -1,39 +1,21 @@
FROM fedora # 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
RUN dnf -y install \ RUN touch /etc/subgid /etc/subuid \
make \ && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
golang \ && echo build:10000:65536 > /etc/subuid \
bats \ && echo build:10000:65536 > /etc/subgid
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 # Use chroot since the default runc does not work when running rootless
RUN dnf -y install golang RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
RUN mkdir /root/buildah && \ # Use VFS since fuse does not work
cd /root/buildah && \ RUN mkdir -p /home/build/.config/containers \
git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
RUN cd /root/buildah/src/github.com/containers/buildah && make && sudo make install
FROM quay.io/buildah/stable:v1.23.0
USER build USER build
WORKDIR /home/build WORKDIR /home/build
RUN export STORAGE_DRIVER=vfs
COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
# Add plugin binary # Add plugin binary
ADD release/linux/amd64/drone-docker /bin/ ADD release/linux/amd64/drone-docker /bin/

View File

@ -10,8 +10,9 @@ set -e
set -x set -x
# linux # linux
# 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-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-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-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-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-heroku ./cmd/drone-heroku