Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[YUNIKORN-2446] Add OCI annotations to public docker images #889

Closed
wants to merge 6 commits into from
Closed

[YUNIKORN-2446] Add OCI annotations to public docker images #889

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a8e259
[YUNIKORN-2446] Add OCI annotations to public docker images
ryankert01 Aug 12, 2024
2848126
indentation
ryankert01 Aug 12, 2024
dfcdf1f
[YUNIKORN-2446] Add OCI annotations to public docker images
ryankert01 Aug 12, 2024
ab71cfb
[YUNIKORN-2446] Add OCI annotations to public docker images
ryankert01 Aug 12, 2024
9968ed8
Merge branch 'apache:master' into YUNIKORN-2446
ryankert01 Aug 12, 2024
48ede8c
code review
ryankert01 Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading