Merge pull request #2 from weaveworks/gh-actions

Add build tooling

Author: yiannistri

.github/workflows/build.yaml

@@ -0,0 +1,33 @@
+name: "Build and push docker container"
+
+on:
+  pull_request:
+  workflow_dispatch:
+    
+jobs:
+  cluster-bootstrap-controller:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.17.x
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Build docker image
+      run: |
+        make docker-build
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        registry: docker.io
+        username: ${{ secrets.WGE_DOCKER_IO_USER }}
+        password: ${{ secrets.WGE_DOCKER_IO_PASSWORD }}
+    - name: Push image to docker registry
+      run: |
+        make docker-push
+
+

Makefile

@@ -29,14 +29,15 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # weave.works/cluster-bootstrap-controller-bundle:$VERSION and weave.works/cluster-bootstrap-controller-catalog:$VERSION.
-IMAGE_TAG_BASE ?= weave.works/cluster-bootstrap-controller
+IMAGE_TAG_BASE ?= weaveworks/cluster-bootstrap-controller
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
 BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
 
+IMAGE_TAG := $(shell tools/image-tag)
 # Image URL to use all building/pushing image targets
-IMG ?= controller:latest
+IMG ?= $(IMAGE_TAG_BASE):$(IMAGE_TAG)
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

tools/image-tag

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REF="${1:-"HEAD"}"
+
+WORKING_SUFFIX=$(if git status --porcelain | grep -qE '^(?:[^?][^ ]|[^ ][^?])\s'; then echo "-WIP"; else echo ""; fi)
+CURRENT_TAG=$(if TAG=$(git describe --tags --exact-match "$REF" 2>/dev/null); then echo $TAG; else echo ""; fi)
+if test -z "$WORKING_SUFFIX" && test ! -z "$CURRENT_TAG" 
+then 
+   echo $CURRENT_TAG
+else 
+   BRANCH_PREFIX=$(git rev-parse --abbrev-ref "$REF")
+   
+   # Fix the object name prefix length to 8 characters to have it consistent across the system.
+   # See https://git-scm.com/docs/git-rev-parse#Documentation/git-rev-parse.txt---shortlength
+   echo "${BRANCH_PREFIX//\//-}-$(git rev-parse --short=8 "$REF")$WORKING_SUFFIX"
+fi