Skip to content

Commit

Permalink
Merge branch 'main' into renovate/go.elastic.co-apm-module-apmhttp-v2…
Browse files Browse the repository at this point in the history
…-2.x
  • Loading branch information
thbkrkr authored Sep 24, 2024
2 parents f4f0acb + 49e40ca commit 4c2b87b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile-ubi
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN --mount=type=cache,mode=0755,target=/go/pkg/mod \

# ---------------------------------------------
# Copy the operator binary into a lighter image
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227.1726694542

# Update the base image packages to the latest versions
RUN microdnf update --setopt=tsflags=nodocs --assumeyes && microdnf clean all
Expand Down
2 changes: 1 addition & 1 deletion hack/deployer/clients/ocp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ RUN curl -fsSLO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${CLIE
mv oc /usr/local/bin/oc && \
rm openshift-client-linux-${CLIENT_VERSION}.tar.gz

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227.1726694542
COPY --from=builder /usr/local/bin/openshift-install .
COPY --from=builder /usr/local/bin/oc .

0 comments on commit 4c2b87b

Please sign in to comment.