From 31d9a027bbf89fbbc97cec10b64a212d7541beed Mon Sep 17 00:00:00 2001
From: Bradley Bickford <bradleybickford@gmail.com>
Date: Fri, 6 Dec 2024 18:27:53 -0500
Subject: [PATCH] Fixes for an issue with entrypoint.sh

---
 Dockerfile.fedora      |  2 +-
 Dockerfile.pwsh.fedora |  2 +-
 Dockerfile.pwsh.ubuntu |  2 +-
 Dockerfile.ubuntu      |  2 +-
 entrypoint.sh          | 16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index dc46009..0b7d56c 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -69,6 +69,6 @@ EXPOSE 8080
 USER coder
 ENV USER=coder
 WORKDIR /home/coder
-ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/entrypoint.sh", "coder"]
 
 
diff --git a/Dockerfile.pwsh.fedora b/Dockerfile.pwsh.fedora
index 98364cd..7808841 100644
--- a/Dockerfile.pwsh.fedora
+++ b/Dockerfile.pwsh.fedora
@@ -75,6 +75,6 @@ EXPOSE 8080
 USER coder
 ENV USER=coder
 WORKDIR /home/coder
-ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/entrypoint.sh", "coder"]
 
 
diff --git a/Dockerfile.pwsh.ubuntu b/Dockerfile.pwsh.ubuntu
index 93f28b0..f3b3097 100644
--- a/Dockerfile.pwsh.ubuntu
+++ b/Dockerfile.pwsh.ubuntu
@@ -76,6 +76,6 @@ EXPOSE 8080
 USER ubuntu
 ENV USER=ubuntu
 WORKDIR /home/ubuntu
-ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/entrypoint.sh", "ubuntu"]
 
 
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index de1656e..fc307e3 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -67,6 +67,6 @@ EXPOSE 8080
 USER ubuntu
 ENV USER=ubuntu
 WORKDIR /home/ubuntu
-ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/entrypoint.sh", "ubuntu"]
 
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 894ca3a..a503444 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,27 +1,27 @@
 #!/bin/bash
 
-CURRENT_GID="$(id -g coder)"
+CURRENT_GID="$(id -g $1)"
 
 if [ -n "${USER_GID}" ] && [ "${USER_GID}" != "${CURRENT_GID}" ]; then
-    groupmod -g $USER_GID coder
-    find / -group $CURRENT_GID -exec chgrp -h coder {} \;
+    groupmod -g $USER_GID $1
+    find / -group $CURRENT_GID -exec chgrp -h $1 {} \;
 fi
 
-CURRENT_UID="$(id -u coder)"
+CURRENT_UID="$(id -u $1)"
 
 if [ -n "${USER_UID}" ] && [ "${USER_UID}" != "${CURRENT_UID}" ]; then
-    usermod -u $USER_UID coder
-    find / -user $CURRENT_UID -exec chown -h coder {} \; 
+    usermod -u $USER_UID $1
+    find / -user $CURRENT_UID -exec chown -h $1 {} \; 
 fi
 
-CURRENT_PASSWD=$(grep -E "^Password: .*$" /home/coder/.config/code-server/config.yaml | cut -d ":" -f 2 | awk '{$1=$1;print}') 
+CURRENT_PASSWD=$(grep -E "^password: .*$" /home/$1/.config/code-server/config.yaml | cut -d ":" -f 2 | awk '{$1=$1;print}') 
 
 if [ -n "${USER_PASSWD}" ] && [ "${CURRENT_PASSWD}" != "${USER_PASSWD}" ] || [ "${CURRENT_PASSWD}" == "PASSWORD"]; then
     if [ -n "${USER_PASSWD}" ]; then
         USER_PASSWD="$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 20; echo)"
     fi
 
-    sed -i "s/^PASSWORD: .*$/PASSWORD: ${USER_PASSWD}/g" /home/coder/.config/code-server/config.yaml
+    sed -i "s/^PASSWORD: .*$/PASSWORD: ${USER_PASSWD}/g" /home/$1/.config/code-server/config.yaml
 fi
 
 /usr/bin/code-server --bind-addr 0.0.0.0:8080 .
\ No newline at end of file