Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions base-java/Dockerfile.ubi9
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@ ARG DOCKER_UPSTREAM_TAG
ARG GOLANG_VERSION
ARG UBI_MINIMAL_VERSION


FROM docker.io/golang:${GOLANG_VERSION} AS build-ub-package-dedupe
ENV GO_BIN="/go/bin"

RUN useradd --no-log-init --create-home --shell /bin/bash appuser
RUN go install github.com/confluentinc/cp-docker-utils/cmd/ub@master

WORKDIR /build/package_dedupe
COPY --chown=appuser:appuser package_dedupe/ ./
RUN go build -ldflags="-w -s" ./package_dedupe.go

WORKDIR /build/ub
COPY --chown=appuser:appuser ub/ ./
RUN go build -ldflags="-w -s" ./ub.go

USER appuser
RUN go test ./...

FROM registry.access.redhat.com/ubi9-minimal:${UBI_MINIMAL_VERSION} AS REFRESH
ARG PROJECT_VERSION
Expand Down Expand Up @@ -70,7 +68,7 @@ RUN update-crypto-policies --set FIPS

COPY license.txt /licenses
COPY --from=build-ub-package-dedupe /build/package_dedupe/package_dedupe /usr/bin/package_dedupe
COPY --from=build-ub-package-dedupe /build/ub/ub /usr/bin/ub
COPY --from=build-ub-package-dedupe /go/bin/ub /usr/bin/ub

COPY --chown=appuser:appuser target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
COPY --chown=appuser:appuser target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/java/${ARTIFACT_ID}/* /usr/share/java/${ARTIFACT_ID}/
Expand Down
15 changes: 0 additions & 15 deletions base-java/ub/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions base-java/ub/go.sum

This file was deleted.

Empty file.
Empty file.
16 changes: 0 additions & 16 deletions base-java/ub/testResources/sampleLog4j.template

This file was deleted.

Loading