From 9a6f41fc4235c74f64f5d3525aaf4da96ed96c87 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bronisz <jean-baptiste.bronisz@adevinta.com>
Date: Tue, 22 Aug 2023 17:31:26 +0200
Subject: [PATCH] Add missing CPU variant for all ARM images

---
 base/base.bzl | 3 ++-
 checksums.bzl | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/base/base.bzl b/base/base.bzl
index 48764db11..41052f2ae 100644
--- a/base/base.bzl
+++ b/base/base.bzl
@@ -1,6 +1,6 @@
 # defines a function to replicate the container images for different distributions
 load("//cacerts:cacerts.bzl", "cacerts")
-load("//:checksums.bzl", "ARCHITECTURES")
+load("//:checksums.bzl", "ARCHITECTURES", "VARIANTS")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary")
 load("@contrib_rules_oci//oci:defs.bzl", "oci_image", "oci_image_index", "structure_test")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
@@ -103,6 +103,7 @@ def distro_components(distro):
                 workdir = workdir,
                 os = "linux",
                 architecture = arch,
+                variant = VARIANTS.get(arch),
             )
 
             oci_image(
diff --git a/checksums.bzl b/checksums.bzl
index ff868c6d6..f69985eeb 100644
--- a/checksums.bzl
+++ b/checksums.bzl
@@ -1,7 +1,3 @@
-# WARNING!!!
-# DO NOT MODIFY THIS FILE DIRECTLY.
-# TO GENERATE THIS RUN: ./updateWorkspaceSnapshots.sh
-
 BASE_ARCHITECTURES = ["amd64", "arm64"]
 
 # Exceptions:
@@ -16,3 +12,8 @@ ARCHITECTURES = BASE_ARCHITECTURES + ["arm", "s390x", "ppc64le"]
 VERSIONS = [
     ("debian11", "bullseye", "11"),
 ]
+
+VARIANTS = {
+    "arm": "v7",
+    "arm64": "v8",
+}