Skip to content

[SC2] Update image builds for RH Certification #940

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

Open
wants to merge 1 commit into
base: release-sc2
Choose a base branch
from
Open

[SC2] Update image builds for RH Certification #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ FROM docker-na-public.artifactory.swg-devops.com/hyc-cloud-private-edge-docker-l

ARG VCS_REF
ARG VCS_URL
ARG IMG_VERSION
ARG IMG_RELEASE

LABEL org.label-schema.vendor="IBM" \
org.label-schema.name="ibm-iam-operator" \
Expand All @@ -27,7 +29,10 @@ LABEL org.label-schema.vendor="IBM" \
name="ibm-iam-operator" \
vendor="IBM" \
description="IBM IM Operator" \
summary="IBM IM Operator"
summary="IBM IM Operator" \
maintainer="IBM IM Squad" \
version=$IMG_VERSION \
release=$IMG_RELEASE

ENV OPERATOR=/usr/local/bin/ibm-iam-operator \
USER_UID=1001 \
Expand All @@ -37,7 +42,7 @@ WORKDIR /

COPY build/_output/bin/manager ${OPERATOR}

COPY licenses /
COPY licenses /licenses

USER ${USER_UID}

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BUILD_LOCALLY ?= 1
NAMESPACE=ibm-common-services
GIT_COMMIT_ID=$(shell git rev-parse --short HEAD)
GIT_REMOTE_URL=$(shell git config --get remote.origin.url)
IMAGE_BUILD_OPTS=--build-arg "VCS_REF=$(GIT_COMMIT_ID)" --build-arg "VCS_URL=$(GIT_REMOTE_URL)"
IMAGE_BUILD_OPTS=--build-arg "VCS_REF=$(GIT_COMMIT_ID)" --build-arg "VCS_URL=$(GIT_REMOTE_URL)" --build-arg "IMG_VERSION=$(VERSION)" --build-arg "IMG_RELEASE=$(shell date +%s)"

# Image URL to use all building/pushing image targets;
# Use your own docker registry and image name for dev/test by overridding the IMG and REGISTRY environment variable.
Expand Down