feat(runtime): install mc to PATH and precreate ~/.mc (OpenShift-safe); simplify mirrio.sh

Author: gi8lino

Dockerfile

@@ -1,11 +1,27 @@
 FROM ghcr.io/containeroo/alpine-toolbox:3.0.0
 
+ENV HOME=/work \
+  MC_CONFIG_DIR=/work/.mc
+
 # renovate: datasource=github-tags depName=minio/mc extractVersion=^RELEASE\\.(?<major>\\d+)-(?<minor>\\d+)-(?<patch>\\d+)T.*Z(-(?<compatibility>.*))?$
 ARG MINIO_VERSION=RELEASE.2023-10-14T01-57-03Z
 
-RUN wget -O /work/mc https://dl.min.io/client/mc/release/linux-amd64/mc && \
-  chmod +x /work/mc
-
+# App script
 ADD mirrio.sh /work/mirrio.sh
+USER root
+RUN chmod 0755 /work/mirrio.sh
+
+# Install mc (version-pinned)
+ADD https://dl.min.io/client/mc/release/linux-amd64/archive/mc.${MINIO_VERSION} /usr/local/bin/mc
+RUN chmod 0755 /usr/local/bin/mc
+
+# OpenShift-friendly: group 0, g+w, setgid
+RUN install -d -o 0 -g 0 -m 2775 /work/.mc \
+  && ln -sfn /work/.mc /.mc
+
+# Drop to non-root (your base convention)
+ARG RUNTIME_USER=10001
+ARG RUNTIME_GROUP=0
+USER ${RUNTIME_USER}:${RUNTIME_GROUP}
 
-ENTRYPOINT ["/work/mirrio.sh"]
+CMD ["/usr/bin/catatonit", "--", "/work/mirrio.sh"]

mirrio.sh

@@ -1,16 +1,15 @@
 #!/usr/bin/env bash
 set -o errexit
 set -o pipefail
+set -o nounset
 
 JOB_NAME=${JOB_NAME:-mirrIO}
 RETENTION=${RETENTION:-30d0h0m}
-ADDITIONAL_PARAMETERS=${ADDITIONAL_PARAMETERS:---quiet}
-MC_BINARY=${MC_BINARY:-/work/mc}
-MC_CONFIG_DIR=${MC_CONFIG_DIR:-/work/.mc}
-mkdir -p "$MC_CONFIG_DIR"
+ADDITIONAL_PARAMETERS=${ADDITIONAL_PARAMETERS:-}
 
-# mc wrapper to use config dir
-mc() { "$MC_BINARY" --config-dir "$MC_CONFIG_DIR" "$@"; }
+# Prefer MC_CONFIG_DIR if set, otherwise fall back to $HOME/.mc
+MC_CONFIG_DIR="${MC_CONFIG_DIR:-${HOME}/.mc}"
+mkdir -p "${MC_CONFIG_DIR}"
 
 pushgateway() {
   if [[ -n "${PUSHGATEWAY_URL:-}" ]]; then
@@ -25,7 +24,7 @@ EOF
 
 check_env() {
   for var in "$@"; do
-    if [[ -z "${!var}" ]]; then
+    if [[ -z "${!var:-}" ]]; then
       echo "${var} is not set!"
       exit 1
     fi
@@ -47,12 +46,15 @@ check_env \
   SOURCE_BUCKET \
   DESTINATION_BUCKET
 
+# If anything errors after here, mark failure + exit
 trap 'notify; exit 1' ERR
+trap 'notify; exit 1' SIGINT SIGTERM
 
 # Split extra parameters into an array so multiple flags work
 # shellcheck disable=SC2206
 read -r -a MC_MIRROR_ARGS <<<"${ADDITIONAL_PARAMETERS}"
 
+# Use env-based config dir (MC_CONFIG_DIR) — no wrapper / flag needed
 mc alias set source "${SOURCE_URL}" "${SOURCE_ACCESSKEY}" "${SOURCE_SECRETKEY}" --api S3v4
 mc alias set destination "${DESTINATION_URL}" "${DESTINATION_ACCESSKEY}" "${DESTINATION_SECRETKEY}" --api S3v4