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

[release-v1.15] Fix labels in static hermetic images #1404

Merged
merged 1 commit into from
Jan 15, 2025
Merged

[release-v1.15] Fix labels in static hermetic images #1404

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
3 changes: 2 additions & 1 deletion openshift/ci-operator/static-images/dispatcher/hermetic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
ARG JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
ARG JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
ARG DEPS_IMAGE
ARG VERSION=""

FROM $DEPS_IMAGE AS deps

Expand All @@ -36,13 +35,15 @@ RUN mvn -Dmaven.repo.local=/third_party/maven --offline package -pl=dispatcher-l
RUN mkdir /app && cp /build/dispatcher-loom/target/dispatcher-loom-1.0-SNAPSHOT.jar /app/app.jar

FROM $JAVA_RUNTIME AS running
ARG VERSION=""

USER 185

LABEL \
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-dispatcher-rhel8-container" \
name="openshift-serverless-1/eventing-kafka-broker-dispatcher-rhel8" \
version=$VERSION \
release=$VERSION \
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Dispatcher" \
maintainer="[email protected]" \
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Dispatcher" \
Expand Down
3 changes: 2 additions & 1 deletion openshift/ci-operator/static-images/receiver/hermetic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
ARG JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
ARG JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
ARG DEPS_IMAGE
ARG VERSION=""

FROM $DEPS_IMAGE AS deps

Expand All @@ -36,13 +35,15 @@ RUN mvn -Dmaven.repo.local=/third_party/maven --offline package -pl=receiver-loo
RUN mkdir /app && cp /build/receiver-loom/target/receiver-loom-1.0-SNAPSHOT.jar /app/app.jar

FROM $JAVA_RUNTIME AS running
ARG VERSION=""

USER 185

LABEL \
com.redhat.component="openshift-serverless-1-eventing-kafka-broker-receiver-rhel8-container" \
name="openshift-serverless-1/eventing-kafka-broker-receiver-rhel8" \
version=$VERSION \
release=$VERSION \
summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Receiver" \
maintainer="[email protected]" \
description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Receiver" \
Expand Down