Merge pull request #11 from drone-plugins/CI-13848

CI-13848 - Fix "`GLIBC_2.34' not found" in buildah-docker

.drone.yml

@@ -1,6 +1,12 @@
 kind: pipeline
-type: docker
 name: default
+type: vm
+
+platform:
+  os: linux
+  arch: amd64
+pool:
+  use: ubuntu
 
 steps:
 - name: build
@@ -96,12 +102,14 @@ steps:
 
 ---
 kind: pipeline
-type: docker
+type: vm
 name: notifications-docker
 
 platform:
   os: linux
   arch: amd64
+pool:
+  use: ubuntu
 
 steps:
 - name: manifest-docker
@@ -166,7 +174,7 @@ steps:
 
 trigger:
   ref:
-  - refs/heads/main
+  - refs/heads/master
   - "refs/tags/**"
 
 depends_on:

README.md

@@ -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 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](http://plugins.drone.io/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).
 
 ## Build
 
@@ -66,7 +66,6 @@ docker run --rm \
   -e PLUGIN_REPO=octocat/hello-world \
   -e DRONE_COMMIT_SHA=d8dbe4d94f15fe89232e0402c6e8a0ddf21af3ab \
   --cap-add=SYS_ADMIN \
-  -v /var/lib/containers/:/var/lib/containers/:Z \
   -v $(pwd):$(pwd) \
   -w $(pwd) \
   plugins/buildah-docker --dry-run

cmd/drone-docker/main.go

@@ -182,6 +182,46 @@ func main() {
 			Usage:  "additional host:IP mapping",
 			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 {
@@ -221,6 +261,14 @@ func run(c *cli.Context) error {
 			NoCache:     c.Bool("no-cache"),
 			AddHost:     c.StringSlice("add-host"),
 			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"),
 		},
 	}
 

docker.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
@@ -44,6 +45,14 @@ type (
 		NoCache     bool     // Docker build no-cache
 		AddHost     []string // Docker build add-host
 		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.
@@ -59,23 +68,28 @@ type (
 func (p Plugin) Exec() error {
 	// Create Auth Config File
 	if p.Login.Config != "" {
-		homeDir, err := os.UserHomeDir()
+		user, err := user.Current()
 		if err != nil {
-			return fmt.Errorf("failed to find home directory: %s", err)
+			return fmt.Errorf("Error getting the current user: %s", err)
+		}
+		root := fmt.Sprintf("/var/tmp/%s/containers/containers/", user.Uid)
+		if err := os.MkdirAll(root, 0777); err != nil {
+			return fmt.Errorf("Error writing runtime dir: %s", err)
 		}
-		dockerHome := fmt.Sprintf("%s/.docker/config.json", homeDir)
-		os.MkdirAll(dockerHome, 0600)
 
-		path := filepath.Join(dockerHome, "config.json")
-		err = ioutil.WriteFile(path, []byte(p.Login.Config), 0600)
-		if err != nil {
-			return fmt.Errorf("Error writing config.json: %s", err)
+		path := filepath.Join(root, "auth.json")
+		if err := ioutil.WriteFile(path, []byte(p.Login.Config), 0600); err != nil {
+			return fmt.Errorf("Error writing auth.json: %s", err)
 		}
+
+		fmt.Printf("Config written to %s\n", path)
 	}
 
 	// login to the Docker registry
 	if p.Login.Password != "" {
 		cmd := commandLogin(p.Login)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
 		err := cmd.Run()
 		if err != nil {
 			return fmt.Errorf("Error authenticating: %s", err)
@@ -184,6 +198,7 @@ func commandInfo() *exec.Cmd {
 func commandBuild(build Build) *exec.Cmd {
 	args := []string{
 		"bud",
+		"--storage-driver", "vfs",
 		"-f", build.Dockerfile,
 	}
 
@@ -217,6 +232,30 @@ func commandBuild(build Build) *exec.Cmd {
 	if build.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 {
 		labelSchema := []string{
@@ -297,14 +336,14 @@ func commandTag(build Build, tag string) *exec.Cmd {
 		target = fmt.Sprintf("%s:%s", build.Repo, tag)
 	)
 	return exec.Command(
-		buildahExe, "tag", source, target,
+		buildahExe, "tag", "--storage-driver", "vfs", source, target,
 	)
 }
 
 // helper function to create the docker push command.
 func commandPush(build Build, tag string) *exec.Cmd {
 	target := fmt.Sprintf("%s:%s", build.Repo, tag)
-	return exec.Command(buildahExe, "push", target)
+	return exec.Command(buildahExe, "push", "--storage-driver", "vfs", target)
 }
 
 // helper to check if args match "docker prune"
@@ -318,7 +357,7 @@ func isCommandRmi(args []string) bool {
 }
 
 func commandRmi(tag string) *exec.Cmd {
-	return exec.Command(buildahExe, "rmi", tag)
+	return exec.Command(buildahExe, "--storage-driver", "vfs", "rmi", tag)
 }
 
 // trace writes each command to stdout with the command wrapped in an xml

docker/acr/Dockerfile.linux.amd64

@@ -18,5 +18,6 @@ USER build
 WORKDIR /home/build
 
 # Add plugin binary
+ADD release/linux/amd64/drone-docker /bin/
 ADD release/linux/amd64/drone-acr /bin/
 ENTRYPOINT ["/bin/drone-acr"]

docker/docker/Dockerfile.linux.amd64

@@ -1,22 +1,12 @@
-# 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 touch /etc/subgid /etc/subuid \
- && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
- && echo build:10000:65536 > /etc/subuid \
- && echo build:10000: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
+FROM quay.io/buildah/stable:v1.36.0
 
+# Set up the working directory
 USER build
 WORKDIR /home/build
+RUN export STORAGE_DRIVER=vfs
 
-# Add plugin binary
+# Add the plugin binary
 ADD release/linux/amd64/drone-docker /bin/
+
+# Set the entrypoint to the plugin binary
 ENTRYPOINT ["/bin/drone-docker"]

docker/ecr/Dockerfile.linux.amd64

@@ -1,22 +1,41 @@
-# 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 fedora
 
-RUN touch /etc/subgid /etc/subuid \
- && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
- && echo build:10000:65536 > /etc/subuid \
- && echo build:10000:65536 > /etc/subgid
+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
 
-# Use chroot since the default runc does not work when running rootless
-RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
+# Workaround - the first install somehow leaves the golang in a bad state
+RUN dnf -y install golang
 
-# Use VFS since fuse does not work
-RUN mkdir -p /home/build/.config/containers \
- && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
+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
 WORKDIR /home/build
+RUN export STORAGE_DRIVER=vfs
+COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
 
 # Add plugin binary
+ADD release/linux/amd64/drone-docker /bin/
 ADD release/linux/amd64/drone-ecr /bin/
 ENTRYPOINT ["/bin/drone-ecr"]

docker/gcr/Dockerfile.linux.amd64

@@ -1,22 +1,41 @@
-# 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 fedora
 
-RUN touch /etc/subgid /etc/subuid \
- && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
- && echo build:10000:65536 > /etc/subuid \
- && echo build:10000:65536 > /etc/subgid
+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
 
-# Use chroot since the default runc does not work when running rootless
-RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
+# Workaround - the first install somehow leaves the golang in a bad state
+RUN dnf -y install golang
 
-# Use VFS since fuse does not work
-RUN mkdir -p /home/build/.config/containers \
- && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
+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
 WORKDIR /home/build
+RUN export STORAGE_DRIVER=vfs
+COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
 
 # Add plugin binary
+ADD release/linux/amd64/drone-docker /bin/
 ADD release/linux/amd64/drone-gcr /bin/
 ENTRYPOINT ["/bin/drone-gcr"]

docker/heroku/Dockerfile.linux.amd64

@@ -1,22 +1,41 @@
-# 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 fedora
 
-RUN touch /etc/subgid /etc/subuid \
- && chmod g=u /etc/subgid /etc/subuid /etc/passwd \
- && echo build:10000:65536 > /etc/subuid \
- && echo build:10000:65536 > /etc/subgid
+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
 
-# Use chroot since the default runc does not work when running rootless
-RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
+# Workaround - the first install somehow leaves the golang in a bad state
+RUN dnf -y install golang
 
-# Use VFS since fuse does not work
-RUN mkdir -p /home/build/.config/containers \
- && echo "driver=\"vfs\"" > /home/build/.config/containers/storage.conf
+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
 WORKDIR /home/build
+RUN export STORAGE_DRIVER=vfs
+COPY --from=0 /root/buildah/src/github.com/containers/buildah/bin/. /bin/
 
 # Add plugin binary
+ADD release/linux/amd64/drone-docker /bin/
 ADD release/linux/amd64/drone-heroku /bin/
 ENTRYPOINT ["/bin/drone-heroku"]

scripts/build.sh

@@ -14,5 +14,4 @@ GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/drone-gcr    ./cmd/drone
 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-heroku   ./cmd/drone-heroku