From e89bceca5ecefd2963fcb50ba22d8d77f16408b9 Mon Sep 17 00:00:00 2001
From: Sudarsan Reddy <sreddy@cloudflare.com>
Date: Tue, 4 Oct 2022 14:14:17 +0100
Subject: [PATCH] TUN-6825: Fix cloudflared:version images require arch hyphens

Once we introduced multi arch docker images, pinning cloudflared
versions required suffixing -(arm64/amd64) to the cloudflared:version
image tag. This change should fix that by adding specific versions to
the cloudflare docker build cycle
---
 .docker-images | 3 +--
 Makefile       | 4 ++++
 cfsetup.yaml   | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.docker-images b/.docker-images
index 984a3183..4ceaf139 100644
--- a/.docker-images
+++ b/.docker-images
@@ -2,8 +2,7 @@ images:
   - name: cloudflared
     dockerfile: Dockerfile.$ARCH
     context: .
-    versions: 
-      - latest
+    version_file: versions
     registries:
     - name: docker.io/cloudflare
       user: env:DOCKER_USER
diff --git a/Makefile b/Makefile
index 691da9bb..7652ff21 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,10 @@ endif
 container:
 	docker build --build-arg=TARGET_ARCH=$(TARGET_ARCH) --build-arg=TARGET_OS=$(TARGET_OS) -t cloudflare/cloudflared-$(TARGET_OS)-$(TARGET_ARCH):"$(VERSION)" .
 
+.PHONY: generate-docker-version
+generate-docker-version:
+	echo latest $(VERSION) > versions
+
 .PHONY: test
 test: vet
 ifndef CI
diff --git a/cfsetup.yaml b/cfsetup.yaml
index 9b8981de..7b7b9cd4 100644
--- a/cfsetup.yaml
+++ b/cfsetup.yaml
@@ -78,6 +78,12 @@ stretch: &stretch
       # same logic as above, but for FIPS packages only
       - ./build-packages-fips.sh
       - make github-release-built-pkgs
+  generate-versions-file:
+    build_dir: *build_dir
+    builddeps: 
+      - build-essential
+    post-cache:
+      - make generate-docker-version
   build-deb:
     build_dir: *build_dir
     builddeps: &build_deb_deps