Improve release workflow

.woodpecker/main.yml

@@ -61,93 +61,44 @@ pipeline:
     commands:
       - make release-cli
 
-  publish-server:
+  build-docker-server:
     group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-server
-    dockerfile: docker/Dockerfile.server
+    image: anbraten/kaniko:v1.6.0-debug
     secrets: [docker_username, docker_password]
-    # TODO: only release as next after 0.15.0 got released
-    tag: [next, latest]
-    when:
-      branch: master
-      event: push
-
-  publish-server-alpine:
-    group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-server
-    dockerfile: docker/Dockerfile.server.alpine
-    secrets: [ docker_username, docker_password ]
-    # TODO: only release as next-alpine after 0.15.0 got released
-    tag: [next-alpine, latest-alpine]
+    environment:
+      - IMAGE_TYPE=server
+    commands:
+      - export WOODPECKER_VERSION=$(make version)
+      - .woodpecker/scripts/build-docker-image.sh
     when:
+      event: [push, tag]
       branch: master
-      event: push
 
-  publish-agent:
+  build-docker-agent:
     group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-agent
-    dockerfile: docker/Dockerfile.agent
+    image: anbraten/kaniko:v1.6.0-debug
     secrets: [docker_username, docker_password]
-    # TODO: only release as next after 0.15.0 got released
-    tag: [next, latest]
-    when:
-      branch: master
-      event: push
-
-  publish-agent-alpine:
-    group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-agent
-    dockerfile: docker/Dockerfile.agent.alpine
-    secrets: [ docker_username, docker_password ]
-    # TODO: only release as next-alpine after 0.15.0 got released
-    tag: [next-alpine, latest-alpine]
+    environment:
+      - IMAGE_TYPE=agent
+    commands:
+      - export WOODPECKER_VERSION=$(make version)
+      - .woodpecker/scripts/build-docker-image.sh
     when:
+      event: [push, tag]
       branch: master
-      event: push
 
-  release-server:
+  build-docker-cli:
     group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-server
-    dockerfile: docker/Dockerfile.server
+    image: anbraten/kaniko:v1.6.0-debug
     secrets: [docker_username, docker_password]
-    tag: [latest, "${DRONE_TAG}"]
-    when:
-      event: tag
-
-  release-server-alpine:
-    group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-server
-    dockerfile: docker/Dockerfile.server.alpine
-    secrets: [ docker_username, docker_password ]
-    tag: [latest-alpine, "${DRONE_TAG}-alpine"]
-    when:
-      event: tag
-
-  release-agent:
-    group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-agent
-    dockerfile: docker/Dockerfile.agent
-    secrets: [docker_username, docker_password]
-    tag: [latest, "${DRONE_TAG}"]
-    when:
-      event: tag
-
-  release-agent-alpine:
-    group: docker
-    image: plugins/docker
-    repo: woodpeckerci/woodpecker-agent
-    dockerfile: docker/Dockerfile.agent.alpine
-    secrets: [ docker_username, docker_password ]
-    tag: [latest-alpine, "${DRONE_TAG}-alpine"]
+    environment:
+      - IMAGE_TYPE=cli
+    commands:
+      - export WOODPECKER_VERSION=$(make version)
+      - .woodpecker/scripts/build-docker-image.sh
     when:
-      event: tag
+      event: [push, tag]
+      branch: master
 
   checksums:
     image: golang:1.16

.woodpecker/scripts/build-docker-image.sh

@@ -0,0 +1,52 @@
+#! /bin/sh
+
+set -e
+
+REGISTRY="docker.io"
+IMAGE="woodpeckerci/woodpecker-$IMAGE_TYPE"
+PATH_BINARY="./dist/${IMAGE_TYPE}_linux_amd64/woodpecker-$IMAGE_TYPE"
+PATH_CONTEXT="./dist/docker-woodpecker-$IMAGE_TYPE"
+PATH_DOCKERFILE="./docker/Dockerfile.$IMAGE_TYPE"
+
+echo "Building $IMAGE_TYPE => $IMAGE:$WOODPECKER_VERSION ..."
+
+# setup credentials
+mkdir -p /kaniko/.docker
+echo "{\"auths\":{\"$DOCKER_REGISTRY\":{\"username\":\"$DOCKER_USERNAME\",\"password\":\"$DOCKER_PASSWORD\"}}}" \
+  > /kaniko/.docker/config.json
+
+echo "Preparing build context ..."
+mkdir -p $PATH_CONTEXT/
+cp $PATH_BINARY $PATH_CONTEXT/
+cp $PATH_DOCKERFILE $PATH_CONTEXT/Dockerfile
+
+# prepare alpine version
+mkdir -p $PATH_CONTEXT-alpine/
+cp $PATH_BINARY $PATH_CONTEXT-alpine/
+cp $PATH_DOCKERFILE.alpine $PATH_CONTEXT-alpine/Dockerfile
+
+if "$WOODPECKER_VERSION" == "next"; then
+  echo "Building pre-release (next) image ..."
+  /kaniko/executor \
+    --context $PATH_CONTEXT/ \
+    --destination $IMAGE:next
+
+  echo "Building pre-release (next) alpine image ..."
+  /kaniko/executor \
+    --context $PATH_CONTEXT-alpine/ \
+    --destination $IMAGE:next-alpine
+else
+  echo "Building image ..."
+  /kaniko/executor \
+    --context $PATH_CONTEXT/ \
+    --destination $IMAGE:latest \
+    --destination $IMAGE:$WOODPECKER_VERSION
+
+  echo "Building alpine image ..."
+  /kaniko/executor \
+    --context $PATH_CONTEXT-alpine/ \
+    --destination $IMAGE:latest-alpine \
+    --destination $IMAGE:$WOODPECKER_VERSION-alpine
+fi
+
+echo "Done"

docker/Dockerfile.agent.alpine

@@ -4,7 +4,7 @@ FROM alpine:3.14
 RUN apk add -U --no-cache ca-certificates
 
 ENV GODEBUG=netdns=go
-ADD dist/agent/linux_amd64/woodpecker-agent /bin/
+ADD ./woodpecker-agent /bin/
 
 EXPOSE 3000
 HEALTHCHECK CMD ["/bin/woodpecker-agent", "ping"]

docker/Dockerfile.cli

@@ -0,0 +1,14 @@
+# use golang image to copy ssl certs later
+FROM golang:1.16
+
+FROM scratch
+ENV GODEBUG=netdns=go
+EXPOSE 3000
+HEALTHCHECK CMD ["/bin/woodpecker-cli", "ping"]
+
+# copy certs from golang:1.16 image
+COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+ADD ./woodpecker-cli /bin/
+
+ENTRYPOINT ["/bin/woodpecker-cli"]

docker/Dockerfile.cli.alpine

@@ -0,0 +1,12 @@
+FROM alpine:3.14.1
+
+RUN apk add -U --no-cache ca-certificates
+
+ENV GODEBUG=netdns=go
+ADD ./woodpecker-cli /bin/
+
+EXPOSE 3000
+HEALTHCHECK CMD ["/bin/woodpecker-cli", "ping"]
+
+ENTRYPOINT ["/bin/woodpecker-cli"]
+

docker/Dockerfile.kaniko-builder

@@ -0,0 +1,5 @@
+# docker/: docker build -t anbraten/kaniko:v1.6.0-debug -f Dockerfile.kaniko-builder .
+
+FROM gcr.io/kaniko-project/executor:v1.6.0-debug
+RUN ["/busybox/mkdir", "-p", "/bin"]
+RUN ["/busybox/ln", "-s", "/busybox/sh", "/bin/sh"]

docker/Dockerfile.server.alpine

@@ -10,6 +10,6 @@ ENV WOODPECKER_DATABASE_DATASOURCE=/var/lib/drone/drone.sqlite
 ENV WOODPECKER_DATABASE_DRIVER=sqlite3
 ENV XDG_CACHE_HOME=/var/lib/drone
 
-ADD dist/server/linux_amd64/woodpecker-server /bin/
+ADD ./woodpecker-server /bin/
 
 ENTRYPOINT ["/bin/woodpecker-server"]