Merge branch 'multi-arch'

Signed-off-by: Rishabh Gupta<r.g.gupta@outlook.com>

Author: zeerorg

.travis.yml

@@ -1,5 +1,6 @@
 # sudo for docker
 sudo: true
+dist: xenial
 
 language: go
 
@@ -11,22 +12,29 @@ go:
 services:
   - docker
 
+addons:
+  apt:
+    packages:
+      - docker-ce
+
 # Only clone the most recent commit.
 git:
   depth: 1
 
 # install qemu-user before running docker build
 before_install:
-  - sudo apt-get install qemu binfmt-support qemu-user-static -y
+  - sudo docker run --privileged linuxkit/binfmt:v0.6
+  - sudo docker run -d --privileged -p 1234:1234 --name buildkit moby/buildkit:latest --addr tcp://0.0.0.0:1234 --oci-worker-platform linux/amd64 --oci-worker-platform linux/armhf
+  - sudo docker cp buildkit:/usr/bin/buildctl /usr/bin/
+  - export BUILDKIT_HOST=tcp://0.0.0.0:1234
+
 
 # Skip the install step. Don't `go get` dependencies. Only build with the code
 # in vendor/
 install: true
 
 script:
-  - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-  - docker build .
-  - docker build -f Dockerfile.armhf .
+  - bash ./travis/build.sh
 
 deploy:
   provider: script

travis/build.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Login into docker
+docker login --username $DOCKER_USER --password $DOCKER_PASSWORD
+
+# Build for amd64 and push
+buildctl build --frontend dockerfile.v0 \
+            --local dockerfile=. \
+            --local context=. \
+            --exporter image \
+            --exporter-opt name=docker.io/zeerorg/cron-connector:test-build-amd64 \
+            --exporter-opt push=true \
+            --frontend-opt platform=linux/amd64 \
+            --frontend-opt filename=./Dockerfile
+
+
+# Build for armhf and push
+buildctl build --frontend dockerfile.v0 \
+            --local dockerfile=. \
+            --local context=. \
+            --exporter image \
+            --exporter-opt name=docker.io/zeerorg/cron-connector:test-build-armhf \
+            --exporter-opt push=true \
+            --frontend-opt platform=linux/armhf \
+            --frontend-opt filename=./Dockerfile.armhf
+
+
+export DOCKER_CLI_EXPERIMENTAL=enabled
+
+# Create manifest list and push that
+docker manifest create zeerorg/cron-connector:test-build \
+            zeerorg/cron-connector:test-build-amd64 \
+            zeerorg/cron-connector:test-build-armhf
+
+docker manifest annotate zeerorg/cron-connector:test-build zeerorg/cron-connector:test-build-armhf --arch arm
+docker manifest annotate zeerorg/cron-connector:test-build zeerorg/cron-connector:test-build-amd64 --arch amd64
+
+docker manifest push zeerorg/cron-connector:test-build

travis/deploy.sh

@@ -1,8 +1,38 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+# Login into docker
 docker login --username $DOCKER_USER --password $DOCKER_PASSWORD
-docker build -t zeerorg/cron-connector:$TRAVIS_TAG .
-docker push zeerorg/cron-connector:$TRAVIS_TAG
-docker build -t zeerorg/cron-connector:$TRAVIS_TAG-arm -f Dockerfile.armhf .
-docker push zeerorg/cron-connector:$TRAVIS_TAG-arm
+
+# Build for amd64 and push
+buildctl build --frontend dockerfile.v0 \
+            --local dockerfile=. \
+            --local context=. \
+            --exporter image \
+            --exporter-opt name=docker.io/zeerorg/cron-connector:${TRAVIS_TAG}-amd64 \
+            --exporter-opt push=true \
+            --frontend-opt platform=linux/amd64 \
+            --frontend-opt filename=./Dockerfile
+
+
+# Build for armhf and push
+buildctl build --frontend dockerfile.v0 \
+            --local dockerfile=. \
+            --local context=. \
+            --exporter image \
+            --exporter-opt name=docker.io/zeerorg/cron-connector:${TRAVIS_TAG}-arm \
+            --exporter-opt push=true \
+            --frontend-opt platform=linux/armhf \
+            --frontend-opt filename=./Dockerfile.armhf
+
+
+export DOCKER_CLI_EXPERIMENTAL=enabled
+
+# Create manifest list and push that
+docker manifest create zeerorg/cron-connector:${TRAVIS_TAG} \
+            zeerorg/cron-connector:${TRAVIS_TAG}-amd64 \
+            zeerorg/cron-connector:${TRAVIS_TAG}-arm
+
+docker manifest annotate zeerorg/cron-connector:${TRAVIS_TAG} zeerorg/cron-connector:${TRAVIS_TAG}-arm --arch arm
+docker manifest annotate zeerorg/cron-connector:${TRAVIS_TAG} zeerorg/cron-connector:${TRAVIS_TAG}-amd64 --arch amd64
+
+docker manifest push zeerorg/cron-connector:${TRAVIS_TAG}