From 5a8d142d6954c42228b2781be3add4dfc29b82a0 Mon Sep 17 00:00:00 2001
From: Mischa Taylor <taylor@linux.com>
Date: Mon, 20 Nov 2023 17:35:39 -0500
Subject: [PATCH] Convert dokken-centos7 to use a bake file

---
 .github/workflows/ci.yml        | 18 ++++-------------
 dokken/centos-7/Containerfile   |  5 -----
 dokken/centos-7/Polly.toml      |  5 -----
 dokken/centos-7/docker-bake.hcl | 36 +++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 24 deletions(-)
 delete mode 100644 dokken/centos-7/Polly.toml
 create mode 100644 dokken/centos-7/docker-bake.hcl

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4e677af..73506ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,24 +107,14 @@ jobs:
         id: image_name
         run: |
           json_data="$(docker buildx bake --print 2>/dev/null)"
-          if echo "$json_data" | jq -e '.target.default.labels["dev.polymathrobotics.image.readme-filepath"]' > /dev/null; then
-            image_name=$(echo $json_data | jq -r '.target."release-default".["dev.polymathrobotics.image.title"]')
-            echo "image_name=$image_name" >> $GITHUB_ENV
-          else
-            echo "image_name=$(docker buildx bake --print 2>/dev/null | jq -r '.target.default.labels."org.opencontainers.image.title"')" >> $GITHUB_ENV
-          fi
+          echo "$json_data" | jq -r '.target.default.labels."org.opencontainers.image.title"')" >> $GITHUB_ENV
 
       - name: Get the image description
         if: github.event_name != 'pull_request'
         id: image_description
         run: |
           json_data="$(docker buildx bake --print 2>/dev/null)"
-          if echo "$json_data" | jq -e '.target.default.labels["dev.polymathrobotics.image.readme-filepath"]' > /dev/null; then
-            image_description=$(echo $json_data | jq -r '.target."release-default".labels["dev.polymathrobotics.image.description"]')
-            echo "image_description=$image_name" >> $GITHUB_ENV
-          else
-            echo "image_description=$(docker buildx bake --print 2>/dev/null | jq -r '.target.default.labels."org.opencontainers.image.description"')" >> $GITHUB_ENV
-          fi
+          echo "$json_data" | jq -r '.target.default.labels."org.opencontainers.image.description"')" >> $GITHUB_ENV
 
       - name: Get the image readme filepath
         if: github.event_name != 'pull_request'
@@ -132,8 +122,8 @@ jobs:
         run: |
           # Check if .group.local.targets.default exists, and if it does, extract its value
           json_data="$(docker buildx bake --print 2>/dev/null)"
-          if echo "$json_data" | jq -e '.target.default.labels["dev.polymathrobotics.image.readme-filepath"]' > /dev/null; then
-            readme_filepath=$(echo $json_data | jq -r '.target.default.labels["dev.polymathrobotics.image.readme-filepath"]')
+          if echo "$json_data" | jq -e '.target.default.labels["io.boxcutter.image.readme-filepath"]' > /dev/null; then
+            readme_filepath=$(echo $json_data | jq -r '.target.default.labels["io.boxcutter.image.readme-filepath"]')
             echo "image_readme_filepath=$readme_filepath" >> $GITHUB_ENV
           else
             echo "image_readme_filepath=${{ matrix.image }}/README.md" >> $GITHUB_ENV
diff --git a/dokken/centos-7/Containerfile b/dokken/centos-7/Containerfile
index 869d17b..d82fc56 100644
--- a/dokken/centos-7/Containerfile
+++ b/dokken/centos-7/Containerfile
@@ -1,11 +1,6 @@
 ARG CONTAINER_REGISTRY=docker.io
 FROM $CONTAINER_REGISTRY/centos:7
 
-LABEL \
-    org.opencontainers.image.source="https://github.com/polymathrobotics/oci" \
-    org.opencontainers.image.licenses="Apache-2.0" \
-    org.opencontainers.image.description="CentOS 7 image for kitchen-dokken"
-
 RUN <<EOF
   yum -y install yum-plugin-copr
   yum -y copr enable jsynacek/systemd-backports-for-centos-7
diff --git a/dokken/centos-7/Polly.toml b/dokken/centos-7/Polly.toml
deleted file mode 100644
index 9e019e8..0000000
--- a/dokken/centos-7/Polly.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[container_image]
-name = "dokken-centos-7"
-tags = ["latest"]
-readme = "dokken/README.md"
-platforms = ["linux/arm64","linux/amd64"]
diff --git a/dokken/centos-7/docker-bake.hcl b/dokken/centos-7/docker-bake.hcl
new file mode 100644
index 0000000..75b71b8
--- /dev/null
+++ b/dokken/centos-7/docker-bake.hcl
@@ -0,0 +1,36 @@
+variable "IMAGE_NAME" {
+  default =  "dokken-centos-7"
+}
+
+variable "CONTAINER_REGISTRY" {
+  default = "docker.io/boxcutter"
+}
+
+# There's no darwin-based Docker, so if we're running on macOS, change the platform to linux
+variable "LOCAL_PLATFORM" {
+  default = regex_replace("${BAKE_LOCAL_PLATFORM}", "^(darwin)", "linux")
+}
+
+target "_common" {
+  dockerfile = "Containerfile"
+  tags = [
+    "${CONTAINER_REGISTRY}/${IMAGE_NAME}:latest"
+  ]
+  labels = {
+    "org.opencontainers.image.source" = "https://github.com/polymathrobotics/oci"
+    "org.opencontainers.image.licenses" = "Apache-2.0"
+    "org.opencontainers.image.description" = "CentOS 7 image for kitchen-dokken"
+    "org.opencontainers.image.title" = "${IMAGE_NAME}"
+    "io.boxcutter.image.readme-filepath" = "dokken/README.md"
+  }
+}
+
+target "local" {
+  inherits = ["_common"]
+  platforms = ["${LOCAL_PLATFORM}"]
+}
+
+target "default" {
+  inherits = ["_common"]
+  platforms = ["linux/amd64", "linux/arm64/v8"]
+} 
\ No newline at end of file