chore: port f1be94b to 2.1

Author: bnpfeife

influxdb/2.1/alpine/Dockerfile

@@ -1,35 +1,14 @@
 FROM alpine:3.14
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts && \
+RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \
     update-ca-certificates
 
 RUN addgroup -S -g 1000 influxdb && \
     adduser -S -G influxdb -u 1000 -h /home/influxdb -s /bin/sh influxdb && \
     mkdir -p /home/influxdb && \
     chown -R influxdb:influxdb /home/influxdb
 
-# Install gosu for easy step-down from root.
-# https://github.com/tianon/gosu/releases
-ENV GOSU_VER 1.12
-RUN set -eux; \
-    ARCH="$(apk --print-arch)" && \
-    case "${ARCH}" in \
-        x86_64)  ARCH=amd64;; \
-        aarch64) ARCH=arm64;; \
-        *)       echo "Unsupported architecture: ${ARCH}"; exit 1;; \
-    esac && \
-    wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$ARCH"; \
-    wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$ARCH.asc"; \
-    export GNUPGHOME="$(mktemp -d)"; \
-    gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-    gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-    gpgconf --kill all; \
-    rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
-    chmod +x /usr/local/bin/gosu; \
-    gosu --version; \
-    gosu nobody true
-
 # Install the infuxd server
 ENV INFLUXDB_VERSION 2.1.1
 RUN set -eux && \

influxdb/2.1/alpine/entrypoint.sh

@@ -386,7 +386,7 @@ function main () {
     fi
 
     if [ "$(id -u)" = 0 ]; then
-        exec gosu influxdb "$BASH_SOURCE" "${@}"
+        exec su-exec influxdb "$BASH_SOURCE" "${@}"
         return
     fi