diff --git a/Dockerfile.dev b/Dockerfile.dev index e789ce2d2d..2b5ba5baf8 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -7,8 +7,8 @@ COPY CREDITS /licenses/CREDITS COPY LICENSE /licenses/LICENSE RUN \ - microdnf update --nodocs && \ - microdnf install ca-certificates --nodocs && \ + microdnf update --nodocs --assumeyes && \ + microdnf install ca-certificates --nodocs --assumeyes && \ microdnf clean all ENTRYPOINT ["mc"] diff --git a/Dockerfile.hotfix b/Dockerfile.hotfix index cc94bb9949..ece218c63a 100644 --- a/Dockerfile.hotfix +++ b/Dockerfile.hotfix @@ -1,8 +1,8 @@ -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.2 as build +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:latest as build -RUN microdnf update --nodocs && microdnf install ca-certificates --nodocs && microdnf clean all +RUN microdnf update --nodocs --assumeyes && microdnf install ca-certificates --nodocs --assumeyes -FROM registry.access.redhat.com/ubi9/ubi-micro:9.2 +FROM registry.access.redhat.com/ubi9/ubi-micro:latest ARG TARGETARCH ARG RELEASE diff --git a/Dockerfile.release b/Dockerfile.release index c0c196ffb1..a800da4371 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,8 +1,8 @@ -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.2 as build +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:latest as build -RUN microdnf update --nodocs && microdnf install ca-certificates --nodocs && microdnf clean all +RUN microdnf update --nodocs --assumeyes && microdnf install ca-certificates --nodocs --assumeyes -FROM registry.access.redhat.com/ubi9/ubi-micro:9.2 +FROM registry.access.redhat.com/ubi9/ubi-micro:latest ARG TARGETARCH ARG RELEASE diff --git a/Dockerfile.release.fips b/Dockerfile.release.fips index e95f3a24f6..e7f0977c05 100644 --- a/Dockerfile.release.fips +++ b/Dockerfile.release.fips @@ -1,8 +1,8 @@ -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.2 as build +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:latest as build -RUN microdnf update --nodocs && microdnf install ca-certificates --nodocs && microdnf clean all +RUN microdnf update --nodocs --assumeyes && microdnf install ca-certificates --nodocs --assumeyes -FROM registry.access.redhat.com/ubi9/ubi-micro:9.2 +FROM registry.access.redhat.com/ubi9/ubi-micro:latest ARG TARGETARCH ARG RELEASE diff --git a/Dockerfile.release.old_cpu b/Dockerfile.release.old_cpu new file mode 100644 index 0000000000..2eebe8e3cf --- /dev/null +++ b/Dockerfile.release.old_cpu @@ -0,0 +1,24 @@ +FROM --platform=linux/amd64 registry.access.redhat.com/ubi8/ubi-minimal:latest as build + +RUN microdnf update --nodocs --assumeyes && microdnf install ca-certificates --nodocs --assumeyes + +FROM registry.access.redhat.com/ubi8/ubi-micro:latest + +ARG TARGETARCH +ARG RELEASE + +LABEL maintainer="MinIO Inc " + +# On RHEL the certificate bundle is located at: +# - /etc/pki/tls/certs/ca-bundle.crt (RHEL 6) +# - /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem (RHEL 7) +COPY --from=build /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/pki/ca-trust/extracted/pem/ + +COPY CREDITS /licenses/CREDITS +COPY LICENSE /licenses/LICENSE + +ADD https://dl.minio.io/client/mc/release/linux-${TARGETARCH}/archive/mc.${RELEASE} /usr/bin/mc + +RUN chmod +x /usr/bin/mc + +ENTRYPOINT ["mc"] diff --git a/docker-buildx.sh b/docker-buildx.sh index 7db80c574c..eecfc7c2c3 100755 --- a/docker-buildx.sh +++ b/docker-buildx.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2015-2021 MinIO, Inc. +# Copyright (c) 2015-2023 MinIO, Inc. # # This file is part of MinIO Object Storage stack # @@ -33,6 +33,15 @@ docker buildx build --push --no-cache \ docker buildx prune -f +docker buildx build --push --no-cache \ + --build-arg RELEASE="${release}" \ + -t "minio/minio:${release}-cpuv1" \ + -t "quay.io/minio/minio:${release}-cpuv1" \ + --platform=linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \ + -f Dockerfile.release.old_cpu . + +docker buildx prune -f + docker buildx build --push --no-cache \ --build-arg RELEASE="${release}" \ -t "minio/minio:${release}.fips" \