From 7692ef45576883878ceaec27824d3c6f73f300a7 Mon Sep 17 00:00:00 2001 From: galargh Date: Wed, 19 Jul 2023 09:09:46 +0200 Subject: [PATCH] chore: rename su-exec callsites to gosu --- Dockerfile | 2 +- bin/container_daemon | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76a2b602c50..acdb70b31eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ ENV SRC_DIR /kubo COPY --from=builder $SRC_DIR/cmd/ipfs/ipfs /usr/local/bin/ipfs COPY --from=builder $SRC_DIR/bin/container_daemon /usr/local/bin/start_ipfs COPY --from=builder $SRC_DIR/bin/container_init_run /usr/local/bin/container_init_run -COPY --from=utilities /usr/sbin/gosu /sbin/su-exec +COPY --from=utilities /usr/sbin/gosu /sbin/gosu COPY --from=utilities /usr/bin/tini /sbin/tini COPY --from=utilities /bin/fusermount /usr/local/bin/fusermount COPY --from=utilities /etc/ssl/certs /etc/ssl/certs diff --git a/bin/container_daemon b/bin/container_daemon index ae8725be5db..9651ad55d1e 100755 --- a/bin/container_daemon +++ b/bin/container_daemon @@ -7,9 +7,9 @@ repo="$IPFS_PATH" if [ "$(id -u)" -eq 0 ]; then echo "Changing user to $user" # ensure folder is writable - su-exec "$user" test -w "$repo" || chown -R -- "$user" "$repo" + gosu "$user" test -w "$repo" || chown -R -- "$user" "$repo" # restart script with new privileges - exec su-exec "$user" "$0" "$@" + exec gosu "$user" "$0" "$@" fi # 2nd invocation with regular user