Publish fluxctl to Docker Hub

- add fluxctl Dockerfile
- add fluxctl image build and push to CircleCI release

Author: stefanprodan

.circleci/config.yml

@@ -125,17 +125,18 @@ jobs:
               docker push "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)"
             fi
       - deploy:
-          name: Maybe push release image and upload binaries
+          name: Maybe push release images and upload binaries
           command: |
             if echo "${CIRCLE_TAG}" | grep -Eq "^[0-9]+(\.[0-9]+)*(-[a-z0-9]+)?$"; then
               # Publish binaries to GitHub
               go get github.com/weaveworks/github-release
-              make release-bins
+              make build-fluxctl
               bin/upload-binaries
 
-              # Publish image on DockerHub
+              # Publish images on DockerHub
               echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin
               docker push "docker.io/fluxcd/flux:${CIRCLE_TAG}"
+              docker push "docker.io/fluxcd/fluxctl:${CIRCLE_TAG}"
 
               # Republish tag with v prefix so it is available to Go Mod
               git config --global user.email fluxcdbot@users.noreply.github.com

Makefile

@@ -178,6 +178,15 @@ $(GENERATED_TEMPLATES_FILE): pkg/install/templates/*.tmpl pkg/install/generate.g
 check-generated: generate-deploy
 	git diff --exit-code -- deploy/
 
+build-fluxctl: release-bins
+	mkdir -p ./build/docker/fluxctl
+	cp ./build/fluxctl_linux_amd64 ./build/docker/fluxctl/fluxctl
+	cp ./docker/Dockerfile.fluxctl ./build/docker/fluxctl/Dockerfile
+	$(SUDO) docker build -t docker.io/fluxcd/fluxctl:$(IMAGE_TAG) \
+		--build-arg VCS_REF="$(VCS_REF)" \
+		--build-arg BUILD_DATE="$(BUILD_DATE)" \
+		-f ./build/docker/fluxctl/Dockerfile ./build/docker/fluxctl
+
 build-docs:
 	@cd docs && docker build -t flux-docs .
 

docker/Dockerfile.fluxctl

@@ -0,0 +1,28 @@
+FROM alpine:3.11
+
+WORKDIR /home/flux
+
+RUN apk add --no-cache openssh-client ca-certificates curl
+
+COPY ./fluxctl /usr/local/bin/
+
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
+      org.opencontainers.image.title="fluxctl" \
+      org.opencontainers.image.description="Flux CLI" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.name="fluxctl" \
+      org.label-schema.description="Flux CLI" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL org.opencontainers.image.revision="$VCS_REF" \
+      org.opencontainers.image.created="$BUILD_DATE" \
+      org.label-schema.vcs-ref="$VCS_REF" \
+      org.label-schema.build-date="$BUILD_DATE"