From 4ec19c7e1b37722ada8deeab62f4218dc6dcfab3 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Thu, 12 Oct 2023 02:35:19 +0200
Subject: [PATCH] ci(opentf): Fix source URLs and authors in labels
---
images/.utils/Earthfile | 15 ++++++++-------
images/opentf/Earthfile | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/images/.utils/Earthfile b/images/.utils/Earthfile
index df6582d3d..7ac1aac70 100644
--- a/images/.utils/Earthfile
+++ b/images/.utils/Earthfile
@@ -1,4 +1,4 @@
-VERSION 0.7
+VERSION --earthly-git-author-args 0.7
SCAN:
COMMAND
@@ -10,11 +10,12 @@ SCAN:
LABEL:
COMMAND
ARG image
- ARG EARTHLY_GIT_CO_AUTHORS
- ARG EARTHLY_GIT_BRANCH
+ ARG version="main"
+ ARG authors="Sheogorath"
+ ARG source="https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/images/${image}"
LABEL org.opencontainers.image.title="${image}"
- LABEL org.opencontainers.image.source="https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/images/${image}"
+ LABEL org.opencontainers.image.source="${source}"
LABEL org.opencontainers.image.url="https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/images/${image}"
- LABEL org.opencontainers.image.version="${EARTHLY_GIT_BRANCH}"
- LABEL org.opencontainers.image.description="Container for ${image} by ${author}"
- LABEL org.opencontainers.image.authors="${EARTHLY_GIT_CO_AUTHORS}"
\ No newline at end of file
+ LABEL org.opencontainers.image.version="${version}"
+ LABEL org.opencontainers.image.description="Container for ${image} by ${authors}"
+ LABEL org.opencontainers.image.authors="${authors}"
\ No newline at end of file
diff --git a/images/opentf/Earthfile b/images/opentf/Earthfile
index 08de6736c..720e87f0f 100644
--- a/images/opentf/Earthfile
+++ b/images/opentf/Earthfile
@@ -25,7 +25,7 @@ container-internal:
COPY +build/tofu /usr/local/bin/opentofu
COPY +build/tofu /usr/local/bin/opentf
ENTRYPOINT ["/usr/local/bin/tofu"]
- DO ../.utils/+LABEL --image=opentf --version=${branch}
+ DO ../.utils/+LABEL --image=opentf --version=${branch} --source=https://github.com/opentofu/opentofu.git
container:
FROM ../mirror+golang
--
GitLab