From ce323be281d356218fb2c96bd66177fa06fa0848 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Fri, 12 Jul 2019 16:39:21 +0200
Subject: [PATCH] Build ARM container images (#80)

It also updates the Circle CI configuration to use the Prometheus orb.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 .circleci/config.yml | 84 ++++++--------------------------------------
 .dockerignore        |  2 ++
 Dockerfile           |  6 +++-
 Makefile             |  3 ++
 4 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65a216f..025e20f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,9 @@
 ---
 version: 2.1
 
+orbs:
+  prometheus: prometheus/prometheus@0.1.0
+
 executors:
   # Whenever the Go version is updated here, .travis.yml and .promu.yml
   # should also be updated.
@@ -13,79 +16,11 @@ jobs:
     executor: golang
 
     steps:
-    - checkout
-    - run: make promu
+    - prometheus/setup_environment
     - run: make
+    - prometheus/store_artifact:
+        file: collectd_exporter
     - run: git diff --exit-code
-    - store_artifacts:
-        path: collectd_exporter
-        destination: /build/collectd_exporter
-    - run: rm -v collectd_exporter
-
-  build:
-    machine: true
-
-    steps:
-    - checkout
-    - run: make promu
-    - run: promu crossbuild -v
-    - persist_to_workspace:
-        root: .
-        paths:
-        - .build
-    - store_artifacts:
-        path: .build
-        destination: /build
-
-  docker_hub_master:
-    executor: golang
-
-    steps:
-    - checkout
-    - setup_remote_docker
-    - attach_workspace:
-        at: .
-    - run: ln -s .build/linux-amd64/collectd_exporter collectd_exporter
-    - run: make docker
-    - run: make docker DOCKER_REPO=quay.io/prometheus
-    - run: docker images
-    - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-    - run: docker login -u $QUAY_LOGIN -p $QUAY_PASSWORD quay.io
-    - run: make docker-publish
-    - run: make docker-publish DOCKER_REPO=quay.io/prometheus
-
-  docker_hub_release_tags:
-    executor: golang
-
-    steps:
-    - checkout
-    - setup_remote_docker
-    - run: mkdir -v -p ${HOME}/bin
-    - run: curl -L 'https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2' | tar xvjf - --strip-components 3 -C ${HOME}/bin
-    - run: echo 'export PATH=${HOME}/bin:${PATH}' >> ${BASH_ENV}
-    - attach_workspace:
-        at: .
-    - run: make promu
-    - run: promu crossbuild tarballs
-    - run: promu checksum .tarballs
-    - run: promu release .tarballs
-    - store_artifacts:
-        path: .tarballs
-        destination: releases
-    - run: ln -s .build/linux-amd64/collectd_exporter collectd_exporter
-    - run: make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
-    - run: make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
-    - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-    - run: docker login -u $QUAY_LOGIN -p $QUAY_PASSWORD quay.io
-    - run: |
-        if [[ "$CIRCLE_TAG" =~ ^v[0-9]+(\.[0-9]+){2}$ ]]; then
-          make docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG"
-          make docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG" DOCKER_REPO=quay.io/prometheus
-          make docker-publish DOCKER_IMAGE_TAG="latest"
-          make docker-publish DOCKER_IMAGE_TAG="latest" DOCKER_REPO=quay.io/prometheus
-        fi
-    - run: make docker-publish DOCKER_IMAGE_TAG="$CIRCLE_TAG"
-    - run: make docker-publish DOCKER_REPO=quay.io/prometheus DOCKER_IMAGE_TAG="$CIRCLE_TAG"
 
 workflows:
   version: 2
@@ -95,11 +30,12 @@ workflows:
         filters:
           tags:
             only: /.*/
-    - build:
+    - prometheus/build:
+        name: build
         filters:
           tags:
             only: /.*/
-    - docker_hub_master:
+    - prometheus/publish_master:
         context: org-context
         requires:
         - test
@@ -107,7 +43,7 @@ workflows:
         filters:
           branches:
             only: master
-    - docker_hub_release_tags:
+    - prometheus/publish_release:
         context: org-context
         requires:
         - test
diff --git a/.dockerignore b/.dockerignore
index 69c6945..ca39bcf 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,5 @@
 .tarballs/
 
 !.build/linux-amd64/
+!.build/linux-armv7
+!.build/linux-arm64
diff --git a/Dockerfile b/Dockerfile
index c30d03b..7b51662 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,11 @@
+ARG ARCH="amd64"
+ARG OS="linux"
 FROM        quay.io/prometheus/busybox:latest
 MAINTAINER  The Prometheus Authors <prometheus-developers@googlegroups.com>
 
-COPY collectd_exporter /bin/collectd_exporter
+ARG ARCH="amd64"
+ARG OS="linux"
+COPY .build/${OS}-${ARCH}/collectd_exporter /bin/collectd_exporter
 
 EXPOSE      9103
 ENTRYPOINT  [ "/bin/collectd_exporter" ]
diff --git a/Makefile b/Makefile
index 547441d..0f733f2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Needs to be defined before including Makefile.common to auto-generate targets
+DOCKER_ARCHS ?= amd64 armv7 arm64
+
 include Makefile.common
 
 DOCKER_IMAGE_NAME ?= collectd-exporter