This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push:
new eed4ea1d [YUNIKORN-2446] Add OCI annotations to public docker images
(#889)
eed4ea1d is described below
commit eed4ea1df4b25df947278e5ae618e347c733c4b7
Author: ryankert <[email protected]>
AuthorDate: Tue Aug 13 10:36:44 2024 -0500
[YUNIKORN-2446] Add OCI annotations to public docker images (#889)
Closes: #889
Signed-off-by: Craig Condit <[email protected]>
---
Makefile | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/Makefile b/Makefile
index 64e9454e..3c8dd301 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,11 @@ TEST_SERVER_BINARY=web-test-server
TOOLS_DIR=tools
REPO=github.com/apache/yunikorn-k8shim/pkg
+IMAGE_SOURCE?=https://github.com/apache/yunikorn-k8shim
+IMAGE_URL?=https://hub.docker.com/r/apache/yunikorn
+LICENSE=Apache-2.0
+DOCS_URL=https://yunikorn.apache.org
+
# PATH
export PATH := $(BASE_DIR)/$(TOOLS_DIR):$(GO_EXE_PATH):$(PATH)
@@ -501,6 +506,15 @@ sched_image: $(OUTPUT)/third-party-licenses.md scheduler
docker/scheduler
--label "yunikorn-k8shim-revision=${SHIM_SHA}" \
--label "BuildTimeStamp=${DATE}" \
--label "Version=${VERSION}" \
+ --label "org.opencontainers.image.title=${SCHEDULER_BINARY}" \
+ --label "org.opencontainers.image.description=Apache YuniKorn
Scheduler" \
+ --label "org.opencontainers.image.version=${VERSION}" \
+ --label "org.opencontainers.image.created=$(DATE)" \
+ --label "org.opencontainers.image.source=${IMAGE_SOURCE}" \
+ --label "org.opencontainers.image.url=${IMAGE_URL}" \
+ --label "org.opencontainers.image.revision=$(SHIM_SHA)" \
+ --label "org.opencontainers.image.license=${LICENSE}" \
+ --label "org.opencontainers.image.documentation=${DOCS_URL}" \
${QUIET}
# Build a plugin image based on the production ready version
@@ -522,6 +536,15 @@ plugin_image: $(OUTPUT)/third-party-licenses.md plugin
docker/plugin conf/schedu
--label "yunikorn-k8shim-revision=${SHIM_SHA}" \
--label "BuildTimeStamp=${DATE}" \
--label "Version=${VERSION}" \
+ --label "org.opencontainers.image.title=${PLUGIN_BINARY}" \
+ --label "org.opencontainers.image.description=Apache YuniKorn Scheduler
(Plugin)" \
+ --label "org.opencontainers.image.version=${VERSION}" \
+ --label "org.opencontainers.image.created=$(DATE)" \
+ --label "org.opencontainers.image.source=${IMAGE_SOURCE}" \
+ --label "org.opencontainers.image.url=${IMAGE_URL}" \
+ --label "org.opencontainers.image.revision=$(SHIM_SHA)" \
+ --label "org.opencontainers.image.license=${LICENSE}" \
+ --label "org.opencontainers.image.documentation=${DOCS_URL}" \
${QUIET}
# Build admission controller binary in a production ready version
@@ -570,6 +593,15 @@ adm_image: $(OUTPUT)/third-party-licenses.md admission
docker/admission
--label "yunikorn-k8shim-revision=${SHIM_SHA}" \
--label "BuildTimeStamp=${DATE}" \
--label "Version=${VERSION}" \
+ --label "org.opencontainers.image.title=${ADMISSION_CONTROLLER_BINARY}"
\
+ --label "org.opencontainers.image.description=Apache YuniKorn Admission
Controller" \
+ --label "org.opencontainers.image.version=${VERSION}" \
+ --label "org.opencontainers.image.created=$(DATE)" \
+ --label "org.opencontainers.image.source=${IMAGE_SOURCE}" \
+ --label "org.opencontainers.image.url=${IMAGE_URL}" \
+ --label "org.opencontainers.image.revision=$(SHIM_SHA)" \
+ --label "org.opencontainers.image.license=${LICENSE}" \
+ --label "org.opencontainers.image.documentation=${DOCS_URL}" \
${QUIET}
# Build all images based on the production ready version
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
