From 40488c5fa300568f8a625368dcdd6d2c3db55a2b Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@digilution.io>
Date: Mon, 3 Aug 2020 10:11:54 +0100
Subject: [PATCH] fix build pipeline

---
 .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1415013..b301a50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,43 @@
-image: docker:latest
 services:
-  - docker:dind
+  - name: docker:dind
 
 stages:
+  - buildx
   - build_latest
+  - container_scanning
 
-before_script:
-  - echo Logging in to $CI_REGISTRY...
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
-  - docker info | grep Registry
+buildx:
+  image: docker:19.03-git
+  stage: buildx
+  variables:
+    GIT_STRATEGY: none
+  artifacts:
+    paths:
+      - buildx
+    expire_in: 1 hour
+  services:
+    - docker:19.03-dind
+  script:
+    - export DOCKER_BUILDKIT=1
+    - git clone git://github.com/docker/buildx ./docker-buildx
+    - docker build --platform=local -o . ./docker-buildx
 
 build_latest:
   stage: build_latest
+  image: docker:19.03-git
+  allow_failure: false
+  services:
+    - name: docker:19.03-dind
+      command: ["--experimental"]
+  before_script:
+    - echo Setting up buildx...
+    - mkdir -p ~/.docker/cli-plugins
+    - mv buildx ~/.docker/cli-plugins/docker-buildx
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    - echo Logging in to $CI_REGISTRY...
   script:
-    - echo Build started on `date` for $CI_COMMIT_REF_NAME
-    - ./build.sh
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+    - apk add --update curl && apk add --update jq && rm -rf /var/cache/apk/*
+    - "sh build.sh"
   only:
     - master