diff --git a/Dockerfile b/Dockerfile index 86f52a4b8..9ab5f0f1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,11 @@ RUN \ FROM alpine:3.12 -ENV MINIO_UPDATE off ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key \ MINIO_KMS_MASTER_KEY_FILE=kms_master_key \ - MINIO_SSE_MASTER_KEY_FILE=sse_master_key + MINIO_SSE_MASTER_KEY_FILE=sse_master_key \ + MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" EXPOSE 9000 diff --git a/Dockerfile.arm.release b/Dockerfile.arm.release index df4cee76d..056dadd55 100644 --- a/Dockerfile.arm.release +++ b/Dockerfile.arm.release @@ -5,11 +5,11 @@ LABEL maintainer="MinIO Inc " COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin -ENV MINIO_UPDATE off ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key \ MINIO_KMS_MASTER_KEY_FILE=kms_master_key \ - MINIO_SSE_MASTER_KEY_FILE=sse_master_key + MINIO_SSE_MASTER_KEY_FILE=sse_master_key \ + MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" RUN \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ diff --git a/Dockerfile.arm64.release b/Dockerfile.arm64.release index ae07d5e47..9b747c916 100644 --- a/Dockerfile.arm64.release +++ b/Dockerfile.arm64.release @@ -5,11 +5,11 @@ LABEL maintainer="MinIO Inc " COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin -ENV MINIO_UPDATE off ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key \ MINIO_KMS_MASTER_KEY_FILE=kms_master_key \ MINIO_SSE_MASTER_KEY_FILE=sse_master_key + MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" RUN \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ diff --git a/Dockerfile.ppc64le.release b/Dockerfile.ppc64le.release index e214634a6..33f2a755a 100644 --- a/Dockerfile.ppc64le.release +++ b/Dockerfile.ppc64le.release @@ -5,11 +5,11 @@ LABEL maintainer="MinIO Inc " COPY --from=qemu /usr/bin/qemu-ppc64le-static /usr/bin -ENV MINIO_UPDATE off ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key \ MINIO_KMS_MASTER_KEY_FILE=kms_master_key \ MINIO_SSE_MASTER_KEY_FILE=sse_master_key + MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" RUN \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ diff --git a/Dockerfile.release b/Dockerfile.release index 75384cbaa..eac14ec0e 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -2,11 +2,11 @@ FROM alpine:3.12 LABEL maintainer="MinIO Inc " -ENV MINIO_UPDATE off ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key \ MINIO_KMS_MASTER_KEY_FILE=kms_master_key \ - MINIO_SSE_MASTER_KEY_FILE=sse_master_key + MINIO_SSE_MASTER_KEY_FILE=sse_master_key \ + MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" RUN \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ diff --git a/Dockerfile.s390x.release b/Dockerfile.s390x.release index 4c6af92c1..3369e38d0 100644 --- a/Dockerfile.s390x.release +++ b/Dockerfile.s390x.release @@ -5,11 +5,11 @@ LABEL maintainer="MinIO Inc " COPY --from=qemu /usr/bin/qemu-s390x-static /usr/bin -ENV MINIO_UPDATE off ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_SECRET_KEY_FILE=secret_key \ MINIO_KMS_MASTER_KEY_FILE=kms_master_key \ MINIO_SSE_MASTER_KEY_FILE=sse_master_key + MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav" RUN \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index e808ffc48..5257d22b0 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -85,8 +85,7 @@ func (a adminAPIHandlers) ServerUpdateHandler(w http.ResponseWriter, r *http.Req } if globalInplaceUpdateDisabled { - // if MINIO_UPDATE=off - inplace update is disabled, mostly - // in containers. + // if MINIO_UPDATE=off - inplace update is disabled, mostly in containers. writeErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrMethodNotAllowed), r.URL) return } diff --git a/cmd/common-main.go b/cmd/common-main.go index 5137a214f..c08f45628 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -105,11 +105,7 @@ func checkUpdate(mode string) { return } - if globalInplaceUpdateDisabled { - logStartupMessage(updateMsg) - } else { - logStartupMessage(prepareUpdateMessage("Run `mc admin update`", lrTime.Sub(crTime))) - } + logStartupMessage(prepareUpdateMessage("Run `mc admin update`", lrTime.Sub(crTime))) } func newConfigDirFromCtx(ctx *cli.Context, option string, getDefaultDir func() string) (*ConfigDir, bool) { diff --git a/cmd/server-main.go b/cmd/server-main.go index 34637f234..d2d396d3c 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -418,7 +418,7 @@ func serverMain(ctx *cli.Context) { } } - if !globalCLIContext.Quiet { + if !globalCLIContext.Quiet && globalInplaceUpdateDisabled { // Check for new updates from dl.min.io. checkUpdate(getMinioMode()) }