add ability to override UID and GID at runtime

Author: pomdtr

Dockerfile

@@ -4,27 +4,35 @@ WORKDIR /build
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
-
 ARG SMALLWEB_VERSION=dev
 RUN go build -ldflags="-s -w -X github.com/pomdtr/smallweb/build.Version=${SMALLWEB_VERSION}" -o smallweb
 
 FROM debian:bookworm-slim
 COPY --from=builder /build/smallweb /usr/local/bin/smallweb
 
-RUN apt update && apt install -y git unzip curl && rm -rf /var/lib/apt/lists/*
+# Install required packages
+RUN apt update && apt install -y git unzip curl gosu && rm -rf /var/lib/apt/lists/*
 
+# Install Deno
 ARG DENO_VERSION=v2.2.2
 RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local/deno sh -s "$DENO_VERSION"
 ENV PATH="/usr/local/deno/bin:$PATH"
 
+# Set up default user with ID 1000
 ARG UID=1000
 ARG GID=1000
-RUN groupadd -g $GID smallweb && useradd -m -s /bin/bash -u $UID -g $GID smallweb
-RUN mkdir /smallweb && chown smallweb:smallweb /smallweb
+RUN groupadd -g $GID smallweb && useradd -m -s /bin/bash -u $GID -g $1000 smallweb
+
+# Create app directory
+RUN mkdir -p /smallweb && chown smallweb:smallweb /smallweb
+
+# Add entrypoint script
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
-USER smallweb
 VOLUME /smallweb
 WORKDIR /smallweb
 EXPOSE 7777 2222
-ENTRYPOINT ["/usr/local/bin/smallweb"]
-CMD [  "up", "--enable-crons", "--addr", ":7777", "--ssh-addr", ":2222"]
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["up", "--enable-crons", "--addr", ":7777", "--ssh-addr", ":2222"]

entrypoint.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+# Get current UID/GID from environment or use defaults
+USER_ID=${PUID:-1000}
+GROUP_ID=${PGID:-1000}
+
+echo "Starting with UID: $USER_ID, GID: $GROUP_ID"
+
+# Update the user to match desired UID/GID if needed
+if [ "$USER_ID" != "1000" ] || [ "$GROUP_ID" != "1000" ]; then
+  echo "Updating user 'smallweb' with new UID:GID -> $USER_ID:$GROUP_ID"
+  groupmod -g "$GROUP_ID" smallweb
+  usermod -u "$USER_ID" -g "$GROUP_ID" smallweb
+fi
+
+# Ensure correct ownership of the application directory
+chown -R smallweb:smallweb /smallweb
+
+# Execute the command as the smallweb user
+exec gosu smallweb:smallweb /usr/local/bin/smallweb "$@"