drone: build images from cross-compiled binary (#58)

Change how we build our `FROM scratch` images to leverage the
already-cross-compiled binary. See `make image-dist`.

Signed-off-by: Jacob Blain Christen <[email protected]>

Author: dweomer

.dockerignore

@@ -1,3 +1,2 @@
 /bin/
-/dist/
 .idea/

.drone.yml

@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: amd64
+name: cross
 
 platform:
   os: linux
@@ -20,7 +20,7 @@ steps:
       - name: docker
         path: /var/run/docker.sock
 
-  - name: build
+  - name: bin-dist
     image: drone.cattle.io/rancher/kim:possible
     pull: never
     environment:
@@ -39,19 +39,23 @@ steps:
       - name: docker
         path: /var/run/docker.sock
 
-  - name: image
+  - name: img-dist
     image: drone.cattle.io/rancher/kim:possible
     pull: never
     environment:
       DOCKER_BUILDKIT: "1"
       GOLANG: drone.cattle.io/rancher/kim:possible
     commands:
-      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} image
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=amd64   image-dist
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=arm64   image-dist
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=arm     image-dist
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=ppc64le image-dist
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=s390x   image-dist
     volumes:
       - name: docker
         path: /var/run/docker.sock
 
-  - name: upload
+  - name: bin-upload
     image: plugins/github-release
     settings:
       api_key:
@@ -72,7 +76,7 @@ steps:
         - refs/head/master
         - refs/tags/*
 
-  - name: image-push
+  - name: img-push
     image: drone.cattle.io/rancher/kim:possible
     pull: never
     environment:
@@ -84,135 +88,11 @@ steps:
       GOLANG: drone.cattle.io/rancher/kim:possible
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} image-push
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-    when:
-      event:
-        - tag
-      instance:
-        - drone-publish.rancher.io
-      ref:
-        - refs/head/master
-        - refs/tags/*
-
-volumes:
-  - name: docker
-    host:
-      path: /var/run/docker.sock
-
----
-kind: pipeline
-type: docker
-name: arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-  - name: prepare
-    image: library/alpine:3.12
-    environment:
-      GOLANG: golang:1.16-alpine3.12
-      IMAGE: drone.cattle.io/rancher/kim
-    commands:
-      - "apk --no-cache add docker-cli git"
-      - "docker build --target docker --build-arg GOLANG --tag $${IMAGE}:possible --tag $${IMAGE}:$(git rev-parse --short HEAD) ."
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-
-  - name: image
-    image: drone.cattle.io/rancher/kim:possible
-    pull: never
-    environment:
-      DOCKER_BUILDKIT: "1"
-      GOLANG: drone.cattle.io/rancher/kim:possible
-    commands:
-      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} image
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-
-  - name: image-push
-    image: drone.cattle.io/rancher/kim:possible
-    pull: never
-    environment:
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_BUILDKIT: "1"
-      GOLANG: drone.cattle.io/rancher/kim:possible
-    commands:
-      - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} image-push
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-    when:
-      event:
-        - tag
-      instance:
-        - drone-publish.rancher.io
-      ref:
-        - refs/head/master
-        - refs/tags/*
-
-volumes:
-  - name: docker
-    host:
-      path: /var/run/docker.sock
-
----
-kind: pipeline
-type: docker
-name: armhf
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-  - name: prepare
-    image: library/alpine:3.12
-    environment:
-      GOLANG: golang:1.16-alpine3.12
-      IMAGE: drone.cattle.io/rancher/kim
-    commands:
-      - "apk --no-cache add docker-cli git"
-      - "docker build --target docker --build-arg GOLANG --tag $${IMAGE}:possible --tag $${IMAGE}:$(git rev-parse --short HEAD) ."
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-
-  - name: image
-    image: drone.cattle.io/rancher/kim:possible
-    pull: never
-    environment:
-      DOCKER_BUILDKIT: "1"
-      GOLANG: drone.cattle.io/rancher/kim:possible
-    commands:
-      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} image
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-
-  - name: image-push
-    image: drone.cattle.io/rancher/kim:possible
-    pull: never
-    environment:
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_BUILDKIT: "1"
-      GOLANG: drone.cattle.io/rancher/kim:possible
-    commands:
-      - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} image-push
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=amd64   image-push
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=arm64   image-push
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=arm     image-push
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=ppc64le image-push
+      - make TAG=${DRONE_TAG:-$(git describe --tags --always)} GOARCH=s390x   image-push
     volumes:
       - name: docker
         path: /var/run/docker.sock
@@ -237,10 +117,10 @@ name: manifest
 
 platform:
   os: linux
-  arch: arm
+  arch: amd64
 
 steps:
-  - name: manifest
+  - name: all
     image: drone.cattle.io/rancher/kim:possible
     pull: never
     environment:
@@ -266,8 +146,6 @@ steps:
         - refs/tags/*
 
 depends_on:
-  - amd64
-  - arm64
-  - armhf
+  - cross
 
 ...

Dockerfile

@@ -11,8 +11,19 @@ RUN set -x \
 FROM base AS docker
 RUN set -x \
  && apk --no-cache add \
+    curl \
     docker-cli \
  && docker --version
+ARG BUILDX_RELEASE=v0.5.1
+RUN set -x \
+ && export BUILDX_ARCH=$(go env GOARCH) \
+ && if [ "${BUILDX_ARCH}" = "arm" ]; then export BUILDX_ARCH="arm-v7"; fi \
+ && mkdir -p /usr/libexec/docker/cli-plugins/ \
+ && curl -fsSL --output /usr/libexec/docker/cli-plugins/docker-buildx \
+    "https://github.com/docker/buildx/releases/download/${BUILDX_RELEASE}/buildx-${BUILDX_RELEASE}.linux-${BUILDX_ARCH}" \
+ && file /usr/libexec/docker/cli-plugins/docker-buildx \
+ && chmod -v +x /usr/libexec/docker/cli-plugins/docker-buildx \
+ && docker buildx version
 
 FROM base AS gobuild
 RUN apk --no-cache add \

Dockerfile.dist

@@ -0,0 +1,6 @@
+FROM scratch AS release
+ARG GOARCH=amd64
+ARG GOOS=linux
+COPY dist/artifacts/kim-${GOOS}-${GOARCH} /bin/kim
+ENTRYPOINT ["kim"]
+CMD ["--help"]

Makefile

@@ -8,6 +8,7 @@ GOOS := $(shell go env GOOS)
 endif
 
 DOCKER_BUILDKIT ?= 1
+DOCKER_BUILDX   ?= docker buildx
 DOCKER_IMAGE    ?= docker image
 DOCKER_MANIFEST ?= docker manifest
 
@@ -68,6 +69,16 @@ image:
 		--tag $(IMG)-$(GOARCH) \
 	.
 
+.PHONY: image-dist
+image-dist:
+	$(DOCKER_BUILDX) build \
+		--file Dockerfile.dist \
+		--platform $(GOOS)/$(GOARCH) \
+		--build-arg GOARCH=$(GOARCH) \
+		--build-arg GOOS=$(GOOS) \
+		--tag $(IMG)-$(GOARCH) \
+	.
+
 .PHONY: image-push
 image-push:
 	$(DOCKER_IMAGE) push $(IMG)-$(GOARCH)
@@ -108,5 +119,13 @@ dogfood: build
 
 .PHONY: symlinks
 symlinks: build
-	ln -nsf $(notdir $(BIN)) $(dir $(BIN))/kubectl-builder
-	ln -nsf $(notdir $(BIN)) $(dir $(BIN))/kubectl-image
+	ln -nsf $(notdir $(BIN)) $(dir $(BIN))./kubectl-builder
+	ln -nsf $(notdir $(BIN)) $(dir $(BIN))./kubectl-image
+
+.PHONY: test-image-build-with-secret
+test-image-build-with-secret: $(BIN)
+	make KIM=$(shell pwd)/$(BIN) -C testdata/image-build-with-secret/.
+
+.PHONY: test-image-build-with-ssh
+test-image-build-with-ssh: $(BIN)
+	make KIM=$(shell pwd)/$(BIN) -C testdata/image-build-with-ssh/.