From 696b129146e65cd5f788561804c13f88e5288d5c Mon Sep 17 00:00:00 2001
From: juan131 <juan.ariza.1311993@gmail.com>
Date: Mon, 25 Apr 2022 20:28:18 +0200
Subject: [PATCH] Fix nss_wrapper configuration

Signed-off-by: juan131 <juan.ariza.1311993@gmail.com>
---
 bitnami/argo-cd/2/debian-10/Dockerfile        |  5 +---
 .../opt/bitnami/argocd/nss-wrapper/nss_group  |  1 +
 .../opt/bitnami/argocd/nss-wrapper/nss_passwd |  1 +
 .../opt/bitnami/scripts/argo-cd/entrypoint.sh | 26 ++++++++++++-------
 4 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_group
 create mode 100644 bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_passwd

diff --git a/bitnami/argo-cd/2/debian-10/Dockerfile b/bitnami/argo-cd/2/debian-10/Dockerfile
index d9951f2273aa..53b34c12904a 100644
--- a/bitnami/argo-cd/2/debian-10/Dockerfile
+++ b/bitnami/argo-cd/2/debian-10/Dockerfile
@@ -19,13 +19,10 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
+
 RUN /opt/bitnami/scripts/argo-cd/postunpack.sh
 ENV APP_VERSION="2.3.3" \
     BITNAMI_APP_NAME="argo-cd" \
-    LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \
-    LNAME="argocd" \
-    NSS_WRAPPER_GROUP="/opt/bitnami/argo-cd/nss_group" \
-    NSS_WRAPPER_PASSWD="/opt/bitnami/argo-cd/nss_passwd" \
     PATH="/opt/bitnami/kustomize/bin:/opt/bitnami/ksonnet/bin:/opt/bitnami/helm/bin:/opt/bitnami/common/bin:/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:$PATH"
 
 USER 1001
diff --git a/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_group b/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_group
new file mode 100644
index 000000000000..07499c111e0c
--- /dev/null
+++ b/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_group
@@ -0,0 +1 @@
+argocd:x:0:
diff --git a/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_passwd b/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_passwd
new file mode 100644
index 000000000000..a3b0604fd2e7
--- /dev/null
+++ b/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/argocd/nss-wrapper/nss_passwd
@@ -0,0 +1 @@
+argocd:x:1001:0:ArgoCD:/opt/bitnami/argo-cd:/bin/false
diff --git a/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/scripts/argo-cd/entrypoint.sh b/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/scripts/argo-cd/entrypoint.sh
index cc89d80ae76c..1992c0db941a 100755
--- a/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/scripts/argo-cd/entrypoint.sh
+++ b/bitnami/argo-cd/2/debian-10/rootfs/opt/bitnami/scripts/argo-cd/entrypoint.sh
@@ -14,17 +14,23 @@ set -o pipefail
 
 print_welcome_page
 
+# Set nss_wrapper vars only when running as non-root
 # Configure libnss_wrapper based on the UID/GID used to run the container
 # This container supports arbitrary UIDs, therefore we have do it dynamically
-if ! am_i_root && ! user_exists "$(id -u)" && [[ -f "$LIBNSS_WRAPPER_PATH" ]]; then
-    info "Configuring libnss_wrapper"
-    NSS_WRAPPER_PASSWD="$(mktemp)"
-    export NSS_WRAPPER_PASSWD
-    NSS_WRAPPER_GROUP="$(mktemp)"
-    export NSS_WRAPPER_GROUP
-    echo "argocd:x:$(id -u):$(id -g):ArgoCD:/opt/bitnami/argo-cd:/bin/false" > "$NSS_WRAPPER_PASSWD"
-    echo "argocd:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
-    chmod 400 "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP"
+if ! am_i_root; then
+    export LNAME="argocd"
+    export LD_PRELOAD="/opt/bitnami/common/lib/libnss_wrapper.so"
+    if ! user_exists "$(id -u)" && [[ -f "$LD_PRELOAD" ]]; then
+        info "Configuring libnss_wrapper"
+        NSS_WRAPPER_PASSWD="$(mktemp)"
+        export NSS_WRAPPER_PASSWD
+        NSS_WRAPPER_GROUP="$(mktemp)"
+        export NSS_WRAPPER_GROUP
+        echo "argocd:x:$(id -u):$(id -g):ArgoCD:/opt/bitnami/argo-cd:/bin/false" > "$NSS_WRAPPER_PASSWD"
+        echo "argocd:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
+        chmod 400 "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP"
+    fi
 fi
 
-exec /opt/bitnami/argo-cd/bin/argocd
+echo ""
+exec "$@"