Set permissions to UI:1000 instead of old 1337

Author: kwuite

Makefile

@@ -40,7 +40,7 @@ include scripts/make/modules/container/docker.mk
 
 # > Services
 
-SERVICES?=caddy whoami privoxy terminal codeserver headscale coredns
+SERVICES?=caddy whoami privoxy terminal codeserver headscale coredns #httptoolkit
 SERVICES_INCLUDES := $(foreach service,$(SERVICES),docker/$(service)/$(service).mk)
 include ${SERVICES_INCLUDES}
 

config/.env-example

@@ -3,5 +3,5 @@ EDGE_EXE=
 PROXY_SERVER=http://localhost:8118
 TLD=localhost
 DEFAULT_URL=https://code.localhost
-UID=1337
-GID=1337
+UID=1000
+GID=1000

docker/codeserver/alpine.dockerfile

@@ -6,20 +6,6 @@ LABEL org.opencontainers.image.title="Alpine code-server" \
       org.opencontainers.image.description="VS Code running on Alpine with code-server" \
       org.opencontainers.image.source="https://github.com/coder/code-server"
 
-# Change the username of the 'node' user to 'developer'
-RUN sed -i 's/^node:/developer:/' /etc/passwd
-
-# Also change the name of the user's group if necessary
-RUN sed -i 's/^node:/developer:/' /etc/group
-
-# Yes, hacky indeed, but need the UID/GID 1000
-RUN mv /home/node /home/developer
-
-# Create the sudoers.d directory and grant the user sudo privileges
-RUN mkdir -p /etc/sudoers.d && \
-    echo 'developer ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/developer && \
-    chmod 0440 /etc/sudoers.d/developer
-
 # Install dependencies required for node-gyp, kerberos, and other tools
 RUN apk add --no-cache \
     git \
@@ -47,5 +33,22 @@ ENV ITEM_URL=https://open-vsx.org/vscode/item
 # Expose the code-server port
 EXPOSE 7682
 
+# Remove user node so we can use UID:1000
+RUN deluser node
+
+# Create a new group with a specific GID
+RUN addgroup -g 1000 developer
+
+# Create a new user with a specific UID, and add it to the group
+RUN adduser -D -u 1000 -G developer developer
+
+# Create the sudoers.d directory and grant the user sudo privileges
+RUN mkdir -p /etc/sudoers.d && \
+    echo 'developer ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/developer && \
+    chmod 0440 /etc/sudoers.d/developer
+
+# Switch to the new user
+USER developer
+
 # Set the default command to run code-server
 CMD ["code-server", "--bind-addr", "0.0.0.0:7682", "--auth", "none"]

docs/docker.src

@@ -0,0 +1 @@
+https://github.com/GoogleContainerTools/distroless