add non-privileged default user for docker archives (#1556)

tsteven4 · web-flow · commit 5d5799f1f17a · 2026-03-13T18:46:12.000-06:00
* add default user for archive images.

* not a tty
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -51,11 +51,7 @@ jobs:
       run: |
         # tests failed before 1.6.0 (and repository structure was different)
         if [[ "${{ inputs.version }}" == "dev" || $(echo -e "${{ inputs.version }}\n1.6.0" | sort -V | head -n1) == "1.6.0" ]]; then
-          container=$(docker create -q -i -t -w /app -v "$(pwd):/app" "${{ env.docker_repository }}:test_${{ inputs.version }}")
-          trap 'docker rm -f "${container}" >/dev/null' 0 1 2 3 15
-          docker start "${container}" >/dev/null
-          docker exec "${container}" setup_user.sh "$(id -u)" "$(id -g)"
-          docker exec -u "$(id -u):$(id -g)" -w /home/gpsbabel/gpsbabel-build -e PNAME=/usr/local/bin/gpsbabel "${container}" ./testo
+          docker run --rm -w /home/gpsbabel/gpsbabel-build -e PNAME=/usr/local/bin/gpsbabel "${{ env.docker_repository }}:test_${{ inputs.version }}" ./testo
         fi
     - name: Docker Metadata
       id: meta
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.10.0 b/tools/archive_images/Dockerfile_gpsbabel_1.10.0
@@ -76,3 +76,5 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabelFE/gpsbabelfe /usr/local/bin
 
 COPY setup_user.sh /usr/local/bin
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.5.0 b/tools/archive_images/Dockerfile_gpsbabel_1.5.0
@@ -72,3 +72,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabel1.5.0/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.5.1 b/tools/archive_images/Dockerfile_gpsbabel_1.5.1
@@ -72,3 +72,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabel1.5.1/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.5.2 b/tools/archive_images/Dockerfile_gpsbabel_1.5.2
@@ -74,3 +74,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
 #ENTRYPOINT ["/usr/local/bin/gpsbabel"]
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.5.3 b/tools/archive_images/Dockerfile_gpsbabel_1.5.3
@@ -71,3 +71,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabel1.5.3/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.5.4 b/tools/archive_images/Dockerfile_gpsbabel_1.5.4
@@ -71,3 +71,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabel1.5.4/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.6.0 b/tools/archive_images/Dockerfile_gpsbabel_1.6.0
@@ -72,3 +72,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabelFE/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.7.0 b/tools/archive_images/Dockerfile_gpsbabel_1.7.0
@@ -72,3 +72,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabelFE/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.8.0 b/tools/archive_images/Dockerfile_gpsbabel_1.8.0
@@ -70,3 +70,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabelFE/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_1.9.0 b/tools/archive_images/Dockerfile_gpsbabel_1.9.0
@@ -84,3 +84,6 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabelFE/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+RUN useradd ubuntu -m -s /bin/bash
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/Dockerfile_gpsbabel_dev b/tools/archive_images/Dockerfile_gpsbabel_dev
@@ -79,3 +79,5 @@ RUN git clone https://github.com/GPSBabel/gpsbabel.git gpsbabel-build\
  && ln -s $(pwd)/gui/GPSBabelFE/gpsbabelfe /usr/local/bin 
 
 COPY setup_user.sh /usr/local/bin
+USER ubuntu:ubuntu
+WORKDIR /app
diff --git a/tools/archive_images/run_gpsbabel.ps1 b/tools/archive_images/run_gpsbabel.ps1
@@ -103,8 +103,7 @@ if (-not $list -and -not $clean) {
             --env LANG=${cultureName} `
             --workdir /app `
             --volume ${DesktopPath}:/app `
-            --user 1000:1000 `
-            "tsteven4/gpsbabel:${version}" | Out-Null
+            "${ImageName}" | Out-Null
     }
 
     # If necessary, start the container
diff --git a/tools/archive_images/run_gpsbabel.sh b/tools/archive_images/run_gpsbabel.sh
@@ -11,7 +11,7 @@ shift $((OPTIND -1))
 container=$(docker create -q -i -t -w /app -v "$(pwd):/app" "tsteven4/gpsbabel:${VERSION}")
 trap 'docker rm -f "${container}" >/dev/null' 0 1 2 3 15
 docker start "${container}" >/dev/null
-docker exec -i -t "${container}" setup_user.sh "$(id -u)" "$(id -g)"
+docker exec -i -t -u 0:0 "${container}" setup_user.sh "$(id -u)" "$(id -g)"
 docker exec -i -t -u "$(id -u):$(id -g)" "${container}" gpsbabel "$@"
 
 
diff --git a/tools/archive_images/run_gpsbabelfe.sh b/tools/archive_images/run_gpsbabelfe.sh
@@ -31,7 +31,7 @@ if [ -z "$(docker ps -a -q -f "name=^${container_name}$")" ]; then
   docker start "${container_name}" >/dev/null
 
 # make sure the users uid/gid exist in the container.
-  docker exec -i -t "${container_name}" setup_user.sh "$(id -u)" "$(id -g)"
+  docker exec -i -t -u 0:0 "${container_name}" setup_user.sh "$(id -u)" "$(id -g)"
 fi
 
 # if necessary start the container.
