Merge branch 'tweak/ci-improvements' into 'dev'

Apply pipeline improvements

See merge request crafty-controller/crafty-commander!75

.gitlab-ci.yml

@@ -1,29 +1,7 @@
 stages:
-- buildx
 - build-dev
 - build-prod
 
-buildx:
-  image: docker:git
-  services:
-  - docker:dind
-  stage: buildx
-  rules:
-  - if: $CI_COMMIT_BRANCH == 'dev'
-  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  variables:
-    GIT_STRATEGY: none
-  tags:
-  - docker
-  artifacts:
-    paths:
-      - buildx
-    expire_in: 1 hour
-  script:
-    - export DOCKER_BUILDKIT=1
-    - git clone git://github.com/docker/buildx ./docker-buildx
-    - docker build --platform=local -o . ./docker-buildx
-
 docker-build-dev:
   image: docker:latest
   services:
@@ -31,21 +9,28 @@ docker-build-dev:
       command: ["--experimental"]
   stage: build-dev
   tags:
-  - docker
+    - docker
   rules:
     - if: $CI_COMMIT_BRANCH == 'dev'
   environment:
     name: development
   before_script:
-    - mkdir -p ~/.docker/cli-plugins
-    - mv buildx ~/.docker/cli-plugins/docker-buildx
+    - |
+      apk --no-cache add curl
+      latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p')
+      echo "Using buildx version $latest_tag"
+      curl -sSLo docker-buildx "https://github.com/docker/buildx/releases/download/$latest_tag/buildx-$latest_tag.linux-amd64"
+      chmod a+x docker-buildx
+      mkdir -p ~/.docker/cli-plugins
+      mv docker-buildx ~/.docker/cli-plugins/docker-buildx
+      docker version
     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
     - echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
   script:
     - |
       tag=":$CI_COMMIT_REF_SLUG"
       echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
-    - docker buildx create --use
+    - docker buildx create --use --name zedBuilder
     - docker buildx build
       --cache-from type=registry,ref="$CI_REGISTRY_IMAGE${tag}"
       --build-arg BUILDKIT_INLINE_CACHE=1
@@ -53,7 +38,10 @@ docker-build-dev:
       --platform linux/arm64/v8,linux/amd64
       --push .
   after_script:
-    - docker buildx imagetools inspect "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - |
+      docker buildx rm zedBuilder && echo "Successfully Stopped builder instance" || echo "Failed to stop builder instance."
+      echo "Please review multi-arch manifests are present:"
+      docker buildx imagetools inspect "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
 docker-build-prod:
   image: docker:latest
@@ -62,21 +50,28 @@ docker-build-prod:
       command: ["--experimental"]
   stage: build-prod
   tags:
-  - docker
+    - docker
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   environment:
     name: production
   before_script:
-    - mkdir -p ~/.docker/cli-plugins
-    - mv buildx ~/.docker/cli-plugins/docker-buildx
+    - |
+      apk --no-cache add curl
+      latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p')
+      echo "Using buildx version $latest_tag"
+      curl -sSLo docker-buildx "https://github.com/docker/buildx/releases/download/$latest_tag/buildx-$latest_tag.linux-amd64"
+      chmod a+x docker-buildx
+      mkdir -p ~/.docker/cli-plugins
+      mv docker-buildx ~/.docker/cli-plugins/docker-buildx
+      docker version
     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
     - echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
   script:
     - |
       tag=""
       echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-    - docker buildx create --use
+    - docker buildx create --use --name zedBuilder
     - docker buildx build
       --cache-from type=registry,ref="$CI_REGISTRY_IMAGE${tag}"
       --build-arg BUILDKIT_INLINE_CACHE=1
@@ -84,4 +79,7 @@ docker-build-prod:
       --platform linux/arm64/v8,linux/amd64
       --push .
   after_script:
-    - docker buildx imagetools inspect "$CI_REGISTRY_IMAGE${tag}"
+    - |
+      docker buildx rm zedBuilder && echo "Successfully Stopped builder instance" || echo "Failed to stop builder instance."
+      echo "Please review multi-arch manifests are present:"
+      docker buildx imagetools inspect "$CI_REGISTRY_IMAGE${tag}"