From 95e1f63149e66e92956eeb48cfea66633659b696 Mon Sep 17 00:00:00 2001 From: Gerd Oberlechner Date: Mon, 13 Jan 2025 11:21:46 +0100 Subject: [PATCH] Bump mariner-distroless and microsoft/golang (#1090) * build(deps): bump cbl-mariner/distroless/base in /frontend Bumps cbl-mariner/distroless/base from `acb1ab4` to `ce44fc2`. --- updated-dependencies: - dependency-name: cbl-mariner/distroless/base dependency-type: direct:production ... Signed-off-by: dependabot[bot] * build(deps): bump cbl-mariner/distroless/base in /backend Bumps cbl-mariner/distroless/base from `acb1ab4` to `ce44fc2`. --- updated-dependencies: - dependency-name: cbl-mariner/distroless/base dependency-type: direct:production ... Signed-off-by: dependabot[bot] * build(deps): bump cbl-mariner/distroless/base in /tooling/image-sync Bumps cbl-mariner/distroless/base from `acb1ab4` to `ce44fc2`. --- updated-dependencies: - dependency-name: cbl-mariner/distroless/base dependency-type: direct:production ... Signed-off-by: dependabot[bot] * build(deps): bump oss/go/microsoft/golang in /frontend Bumps oss/go/microsoft/golang from `6c1b07d` to `e6951a3`. --- updated-dependencies: - dependency-name: oss/go/microsoft/golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] * build(deps): bump oss/go/microsoft/golang in /backend Bumps oss/go/microsoft/golang from `6c1b07d` to `e6951a3`. --- updated-dependencies: - dependency-name: oss/go/microsoft/golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] * build(deps): bump oss/go/microsoft/golang in /tooling/image-sync Bumps oss/go/microsoft/golang from `6c1b07d` to `e6951a3`. --- updated-dependencies: - dependency-name: oss/go/microsoft/golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- backend/Dockerfile | 4 ++-- frontend/Dockerfile | 4 ++-- tooling/image-sync/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 355413d65c..b86034896c 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ # Builder image installs tools needed to build aro-hcp-backend -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-fips-cbl-mariner2.0@sha256:6c1b07df15c152fb6a7f4eeece5f50824d83b8bf672709cc951aaa0d5c29887f as builder +FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-fips-cbl-mariner2.0@sha256:e6951a34cc0cbdc62b5110c4301dfe9c8daf8ee89c1b8616082a6e0b89cd820f as builder WORKDIR /app ADD archive.tar.gz . # https://github.com/microsoft/go/tree/microsoft/main/eng/doc/fips#build-option-to-require-fips-mode @@ -8,7 +8,7 @@ RUN cd backend && make backend # Deployment image copies aro-hcp-backend from builder image -FROM --platform=linux/amd64 mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:acb1ab4d2162ecebbe67888bf679f26dcaef29c153954a09396e020e9639862d +FROM --platform=linux/amd64 mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:ce44fc29db88c9aba8041a50c1abcd19a54f997c2b99a8c513e8ec113261374a WORKDIR / COPY --from=builder /app/backend/aro-hcp-backend . ENTRYPOINT ["/aro-hcp-backend"] diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 37d1882d38..015c5059ab 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Base and builder image will need to be replaced by Fips compliant one -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-fips-cbl-mariner2.0@sha256:6c1b07df15c152fb6a7f4eeece5f50824d83b8bf672709cc951aaa0d5c29887f as builder +FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-fips-cbl-mariner2.0@sha256:e6951a34cc0cbdc62b5110c4301dfe9c8daf8ee89c1b8616082a6e0b89cd820f as builder WORKDIR /app ADD archive.tar.gz . @@ -7,7 +7,7 @@ ADD archive.tar.gz . ENV CGO_ENABLED=1 GOFLAGS='-tags=requirefips' RUN cd frontend && make frontend -FROM --platform=linux/amd64 mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:acb1ab4d2162ecebbe67888bf679f26dcaef29c153954a09396e020e9639862d +FROM --platform=linux/amd64 mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:ce44fc29db88c9aba8041a50c1abcd19a54f997c2b99a8c513e8ec113261374a WORKDIR / COPY --from=builder /app/frontend/aro-hcp-frontend . ENTRYPOINT ["/aro-hcp-frontend"] diff --git a/tooling/image-sync/Dockerfile b/tooling/image-sync/Dockerfile index 4a2e64e0a5..a40ae2c8a4 100644 --- a/tooling/image-sync/Dockerfile +++ b/tooling/image-sync/Dockerfile @@ -1,11 +1,11 @@ -FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-fips-cbl-mariner2.0@sha256:6c1b07df15c152fb6a7f4eeece5f50824d83b8bf672709cc951aaa0d5c29887f as builder +FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.23-fips-cbl-mariner2.0@sha256:e6951a34cc0cbdc62b5110c4301dfe9c8daf8ee89c1b8616082a6e0b89cd820f as builder WORKDIR /app ADD . . # https://github.com/microsoft/go/tree/microsoft/main/eng/doc/fips#build-option-to-require-fips-mode RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=containers_image_openpgp,requirefips . -FROM --platform=linux/amd64 mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:acb1ab4d2162ecebbe67888bf679f26dcaef29c153954a09396e020e9639862d +FROM --platform=linux/amd64 mcr.microsoft.com/cbl-mariner/distroless/base:2.0-nonroot@sha256:ce44fc29db88c9aba8041a50c1abcd19a54f997c2b99a8c513e8ec113261374a WORKDIR / COPY --from=builder /app/image-sync .