From 132e2b57dc09c86d86bfcfbc8bf2f024fdf77c8c Mon Sep 17 00:00:00 2001
From: Adrien le Maire <adrien@alemaire.be>
Date: Tue, 2 Feb 2021 10:46:36 +0000
Subject: [PATCH] Update minio/Makefile Deleted minio/entrypoint.sh

---
 minio/Makefile      |   2 +-
 minio/entrypoint.sh | 104 --------------------------------------------
 2 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100755 minio/entrypoint.sh

diff --git a/minio/Makefile b/minio/Makefile
index 2345756..a4ddf25 100644
--- a/minio/Makefile
+++ b/minio/Makefile
@@ -10,7 +10,7 @@ nopush:
 		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
 push:
-	docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le --push \
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
 	    --build-arg VERSION=$(VERSION) \
     	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
 	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
diff --git a/minio/entrypoint.sh b/minio/entrypoint.sh
deleted file mode 100755
index b55a999..0000000
--- a/minio/entrypoint.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# MinIO Cloud Storage, (C) 2019 MinIO, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# If command starts with an option, prepend minio.
-if [ "${1}" != "minio" ]; then
-    if [ -n "${1}" ]; then
-        set -- minio "$@"
-    fi
-fi
-
-## Look for docker secrets at given absolute path or in default documented location.
-docker_secrets_env() {
-    if [ -f "$MINIO_ACCESS_KEY_FILE" ]; then
-        ACCESS_KEY_FILE="$MINIO_ACCESS_KEY_FILE"
-    else
-        ACCESS_KEY_FILE="/run/secrets/$MINIO_ACCESS_KEY_FILE"
-    fi
-    if [ -f "$MINIO_SECRET_KEY_FILE" ]; then
-        SECRET_KEY_FILE="$MINIO_SECRET_KEY_FILE"
-    else
-        SECRET_KEY_FILE="/run/secrets/$MINIO_SECRET_KEY_FILE"
-    fi
-
-    if [ -f "$ACCESS_KEY_FILE" ] && [ -f "$SECRET_KEY_FILE" ]; then
-        if [ -f "$ACCESS_KEY_FILE" ]; then
-            MINIO_ACCESS_KEY="$(cat "$ACCESS_KEY_FILE")"
-            export MINIO_ACCESS_KEY
-        fi
-        if [ -f "$SECRET_KEY_FILE" ]; then
-            MINIO_SECRET_KEY="$(cat "$SECRET_KEY_FILE")"
-            export MINIO_SECRET_KEY
-        fi
-    fi
-}
-
-## Set KMS_MASTER_KEY from docker secrets if provided
-docker_kms_encryption_env() {
-    if [ -f "$MINIO_KMS_MASTER_KEY_FILE" ]; then
-        KMS_MASTER_KEY_FILE="$MINIO_KMS_MASTER_KEY_FILE"
-    else
-        KMS_MASTER_KEY_FILE="/run/secrets/$MINIO_KMS_MASTER_KEY_FILE"
-    fi
-
-    if [ -f "$KMS_MASTER_KEY_FILE" ]; then
-        MINIO_KMS_MASTER_KEY="$(cat "$KMS_MASTER_KEY_FILE")"
-        export MINIO_KMS_MASTER_KEY
-    fi
-}
-
-## Legacy
-## Set SSE_MASTER_KEY from docker secrets if provided
-docker_sse_encryption_env() {
-    SSE_MASTER_KEY_FILE="/run/secrets/$MINIO_SSE_MASTER_KEY_FILE"
-
-    if [ -f "$SSE_MASTER_KEY_FILE" ]; then
-        MINIO_SSE_MASTER_KEY="$(cat "$SSE_MASTER_KEY_FILE")"
-        export MINIO_SSE_MASTER_KEY
-    fi
-}
-
-# su-exec to requested user, if service cannot run exec will fail.
-docker_switch_user() {
-    if [ ! -z "${MINIO_USERNAME}" ] && [ ! -z "${MINIO_GROUPNAME}" ]; then
-
-	if [ ! -z "${MINIO_UID}" ] && [ ! -z "${MINIO_GID}" ]; then
-		addgroup -S -g "$MINIO_GID" "$MINIO_GROUPNAME" && \
-                        adduser -S -u "$MINIO_UID" -G "$MINIO_GROUPNAME" "$MINIO_USERNAME"
-	else
-		addgroup -S "$MINIO_GROUPNAME" && \
-                	adduser -S -G "$MINIO_GROUPNAME" "$MINIO_USERNAME"
-	fi
-
-        exec su-exec "${MINIO_USERNAME}:${MINIO_GROUPNAME}" "$@"
-    else
-        # fallback
-        exec "$@"
-    fi
-}
-
-## Set access env from secrets if necessary.
-docker_secrets_env
-
-## Set kms encryption from secrets if necessary.
-docker_kms_encryption_env
-
-## Set sse encryption from secrets if necessary. Legacy
-docker_sse_encryption_env
-
-## Switch to user if applicable.
-docker_switch_user "$@"