From 187e7d1c1623851811a998d86b548239a70f5f64 Mon Sep 17 00:00:00 2001
From: Vojtech Mares <iam@vojtechmares.com>
Date: Sun, 12 May 2024 08:22:49 +0200
Subject: [PATCH 1/4] ci: use ko.build to build docker image

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d12e01..8774b69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,10 @@ build:
   variables:
     IMAGE: $CI_REGISTRY_IMAGE
     TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+    KO_DOCKER_REPO: $IMAGE:$TAG
   before_script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
-    - docker info
+    - wget https://github.com/ko-build/ko/releases/latest/download/ko_Linux_x86_64.tar.gz
+    - tar -xzvf ko_Linux_x86_64.tar.gz -C /usr/local/bin
   script:
-    - docker buildx create --name yggdrasil --use
-    - docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE:$TAG --push .
+    - ko build --platform=linux/arm64,linux/amd64 ./cmd/yggdrasil

From 02a2035b2612cfa86d1a4215a7f5cb8fd59f4586 Mon Sep 17 00:00:00 2001
From: Vojtech Mares <iam@vojtechmares.com>
Date: Sun, 12 May 2024 09:41:18 +0200
Subject: [PATCH 2/4] ci: fix build tag

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8774b69..7fd126f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,11 @@ stages:
 build:
   stage: build
   variables:
-    IMAGE: $CI_REGISTRY_IMAGE
     TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-    KO_DOCKER_REPO: $IMAGE:$TAG
+    KO_DOCKER_REPO: $CI_REGISTRY_IMAGE
   before_script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
     - wget https://github.com/ko-build/ko/releases/latest/download/ko_Linux_x86_64.tar.gz
     - tar -xzvf ko_Linux_x86_64.tar.gz -C /usr/local/bin
   script:
-    - ko build --platform=linux/arm64,linux/amd64 ./cmd/yggdrasil
+    - ko build --platform=linux/arm64,linux/amd64 --tags $TAG ./cmd/yggdrasil

From ec7a3e0ed798e9f4ac4e4d9f6cf8c182ec47c331 Mon Sep 17 00:00:00 2001
From: Vojtech Mares <iam@vojtechmares.com>
Date: Sun, 12 May 2024 09:45:48 +0200
Subject: [PATCH 3/4] ci: use custom image containing ko and docker-cli

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fd126f..0cd4a1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,11 @@ stages:
 
 build:
   stage: build
+  image: ghcr.io/vojtechmares/container-images/ko-build:sha-43a026ac57ae13623239eaa76669757fc713e32d
   variables:
     TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
     KO_DOCKER_REPO: $CI_REGISTRY_IMAGE
   before_script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
-    - wget https://github.com/ko-build/ko/releases/latest/download/ko_Linux_x86_64.tar.gz
-    - tar -xzvf ko_Linux_x86_64.tar.gz -C /usr/local/bin
   script:
     - ko build --platform=linux/arm64,linux/amd64 --tags $TAG ./cmd/yggdrasil

From bd4ec98b24debd6d807cf416fa4fe04ba8794de1 Mon Sep 17 00:00:00 2001
From: Vojtech Mares <iam@vojtechmares.com>
Date: Sun, 12 May 2024 09:59:13 +0200
Subject: [PATCH 4/4] ci: bump ko image

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cd4a1a..2a55c69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 
 build:
   stage: build
-  image: ghcr.io/vojtechmares/container-images/ko-build:sha-43a026ac57ae13623239eaa76669757fc713e32d
+  image: ghcr.io/vojtechmares/container-images/ko-build:sha-4fe26ad8a0623547dfe3e76367450fbf9d6c4148
   variables:
     TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
     KO_DOCKER_REPO: $CI_REGISTRY_IMAGE