Merge pull request freifunk-gluon#2975 from freifunk-gluon/docker-uids

Fix Dockerfile / container.sh for UID/GID other than 1000
herbetom · Sep 11, 2023 · 251392b · 251392b
2 parents 0db797c + c8bbef8
commit 251392b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ecdsautils \
     lua-check \
     shellcheck \
+    libnss-unknown \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -30,7 +31,7 @@ RUN mkdir /tmp/ec &&\
     mv bin/ec-linux-amd64 /usr/local/bin/editorconfig-checker &&\
     rm -rf /tmp/ec
 
-RUN useradd -d /gluon gluon
+RUN useradd -m -d /gluon -u 100 -g 100 -o gluon
 USER gluon
 
 VOLUME /gluon

diff --git a/scripts/container.sh b/scripts/container.sh
@@ -12,13 +12,13 @@ TAG="gluon:${BRANCH:-latest}"
 if [ "$(command -v podman)" ]
 then
 	podman build -t "${TAG}" contrib/docker
-	podman run -it --rm --userns=keep-id --volume="$(pwd):/gluon" "${TAG}"
+	podman run -it --rm -u "$(id -u):$(id -g)" --userns=keep-id --volume="$(pwd):/gluon" "${TAG}"
 elif [ "$(command -v docker)" ]
 then
 	docker build -t "${TAG}" contrib/docker
-	docker run -it --rm --volume="$(pwd):/gluon" "${TAG}"
+	docker run -it --rm -u "$(id -u):$(id -g)" --volume="$(pwd):/gluon" -e HOME=/gluon "${TAG}"
 else
-	1>&2 echo "Please install either podman or docker. Exiting" >/dev/null
+	echo "Please install either podman or docker. Exiting" >&2
 	exit 1
 fi