Skip to content

Commit 5adfc81

Browse files
authored
Update base os from RHEL9 to RHEL10 (#2882)
1 parent 189f12c commit 5adfc81

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ ARG GOARCH
3232
ARG FIPS_ENABLED
3333
RUN echo "FIPS_ENABLED is: $FIPS_ENABLED"
3434
RUN if [ "$FIPS_ENABLED" = "true" ]; then \
35-
CGO_ENABLED=1 GOEXPERIMENT=boringcrypto GOOS=linux GOARCH=${GOARCH} go build -tags fips -a -ldflags "${LDFLAGS}" -o manager cmd/main.go; \
35+
CGO_ENABLED=1 GOEXPERIMENT=boringcrypto GOOS=linux GOARCH=${GOARCH} go build -tags fips -a -ldflags "${LDFLAGS}" -o manager cmd/main.go; \
3636
else \
37-
CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -ldflags "${LDFLAGS}" -o manager cmd/main.go; \
37+
CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -ldflags "${LDFLAGS}" -o manager cmd/main.go; \
3838
fi
3939

4040
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -ldflags "${LDFLAGS}" -o helpers cmd/helpers/main.go
4141
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -ldflags "${LDFLAGS}" -o yaml-mapper cmd/yaml-mapper/main.go
4242

43-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS certs
43+
FROM registry.access.redhat.com/ubi10/ubi-minimal:latest AS certs
4444

45-
FROM registry.access.redhat.com/ubi9/ubi-micro:latest
45+
FROM registry.access.redhat.com/ubi10/ubi-micro:latest
4646

4747
LABEL name="datadog/operator"
4848
LABEL vendor="Datadog Inc."
4949
LABEL summary="The Datadog Operator aims at providing a new way to deploy the Datadog Agent on Kubernetes"
5050
LABEL description="Datadog provides a modern monitoring and analytics platform. Gather \
51-
metrics, logs and traces for full observability of your Kubernetes cluster with \
52-
Datadog Operator."
51+
metrics, logs and traces for full observability of your Kubernetes cluster with \
52+
Datadog Operator."
5353
LABEL maintainer="Datadog Inc."
5454

5555
# ubi-micro variant does not have CA certificates installed

check-operator.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG LDFLAGS
2525
ARG GOARCH
2626
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -ldflags "${LDFLAGS}" -o check-operator cmd/check-operator/main.go
2727

28-
FROM registry.access.redhat.com/ubi9/ubi-micro:latest
28+
FROM registry.access.redhat.com/ubi10/ubi-micro:latest
2929
WORKDIR /
3030
COPY --from=builder /workspace/check-operator .
3131
USER 1001

0 commit comments

Comments
 (0)