From 2b425c4784b6cab1f5b9810be60796904196292d Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Wed, 28 Sep 2022 23:59:25 +0100
Subject: [PATCH 1/3] Bump docker-reg image version

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70587b9..c2ab680 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ Build "buildctl":
 
 Deploy Images:
   stage: deploy
-  image: docker.kodo.org.uk/ci-images/docker-reg:latest
+  image: docker.kodo.org.uk/ci-images/docker-reg:0.2.0
   rules:
   - if: $CI_COMMIT_TAG =~ /^v[0-9]/
   script:
-- 
GitLab


From c308014aa4b5219d9dc93de19abecb38b457dce9 Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Tue, 4 Oct 2022 02:44:55 +0100
Subject: [PATCH 2/3] Add TARGET_PLATFORMS CI variable

---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c2ab680..75714c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,8 @@
+variables:
+  TARGET_PLATFORMS:
+    description: Docker/OCI platform specifiers to build images for;
+      comma separated
+
 stages:
 - check
 - build
@@ -38,6 +43,7 @@ Checks:
     --local dockerfile=.
     --opt target=$TARGET
     --output=type=image,name=$CI_REGISTRY_IMAGE/$TARGET:build-$CI_PIPELINE_IID,push=true
+    ${TARGET_PLATFORMS:+--opt platform=$TARGET_PLATFORMS}
     ${REVISION:+--opt build-arg:REVISION=$REVISION}
     ${VERSION:+--opt build-arg:VERSION=$VERSION}
 
-- 
GitLab


From b6dba20460829c56cf676e54dad2256f27150d1d Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Tue, 4 Oct 2022 02:55:05 +0100
Subject: [PATCH 3/3] Bump Go version for latest releases

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b67d4b1..a35ff80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG VERSION
 
-FROM --platform=$BUILDPLATFORM golang:1.17-alpine as go
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine as go
 
 # Get source code
 WORKDIR /src
-- 
GitLab