cs61-build-docker uses user ID from environment

Author: kohler

cs61-run-docker

@@ -8,6 +8,7 @@ verbose=false
 arch="`arch`"
 tag=
 platform=
+container=
 while test "$#" -ne 0; do
     if test "$1" = "-f" -o "$1" = "--fresh"; then
         fresh=1
@@ -26,12 +27,18 @@ while test "$#" -ne 0; do
     elif test "$1" = "-x" -o "$1" = "--x86-64" -o "$1" = "--x86_64" -o "$1" = "--amd64"; then
         platform=linux/amd64
         shift
+    elif test "(" "$1" = "-t" -o "$1" = "--tag" ")" -a "$#" -gt 1; then
+        tag="$2"
+        shift 2
+    elif test -z "$container" -a -z "$fresh" -a -n "$1" && expr "$1" : '[0-9a-f][0-9a-f][0-9a-f]*$' >/dev/null 2>&1; then
+        container="$1"
+        shift
     else
         armtext=
         if test "$arch" = "arm64" -o "$arch" = "aarch64"; then
             armtext=" [-a|--arm] [-x|--x86-64]"
         fi
-        echo "Usage: cs61-run-docker [-f|--fresh]$armtext [-V|--verbose]" 1>&2
+        echo "Usage: cs61-run-docker [-f|--fresh]$armtext [-V|--verbose] [CONTAINERID]" 1>&2
         exit 1
     fi
 done
@@ -61,6 +68,13 @@ else
 fi
 myfileid=`stat $statformatarg %d:%i "${BASH_SOURCE[0]}" 2>/dev/null`
 
+ssharg=
+sshenvarg=
+if test -n "$SSH_AUTH_SOCK" -a "`uname`" = Darwin; then
+    ssharg=" --mount type=bind,src=/run/host-services/ssh-auth.sock,target=/run/host-services/ssh-auth.sock"
+    sshenvarg=" -e SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock"
+fi
+
 dir="`pwd`"
 subdir=""
 while test "$dir" != / -a "$dir" != ""; do
@@ -78,24 +92,31 @@ if test -z "$maindir" && expr "${BASH_SOURCE[0]}" : / >/dev/null 2>&1; then
     subdir=""
 fi
 
-ssharg=
-sshenvarg=
-if test -n "$SSH_AUTH_SOCK" -a "`uname`" = Darwin; then
-    ssharg=" --mount type=bind,src=/run/host-services/ssh-auth.sock,target=/run/host-services/ssh-auth.sock"
-    sshenvarg=" -e SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock"
-fi
-
-if test -n "$maindir" -a -z "$fresh"; then
-    existing_image="`docker ps -f status=running -f ancestor=$tag -f volume=/host_mnt"$maindir" --no-trunc --format "{{.CreatedAt}},{{.ID}}" | sort -r | head -n 1`"
-    if test -n "$existing_image"; then
-        created_at="`echo $existing_image | sed 's/,.*//'`"
-        image="`echo $existing_image | sed 's/^.*,//'`"
-        image12="`echo $image | head -c 12`"
-        echo "* Using running container $image12, created $created_at" 1>&2
-        echo "- To start a new container, exit then \`cs61-run-docker -f\`" 1>&2
-        echo "- To kill this container, exit then \`docker kill $image12\`" 1>&2
-        vexec docker exec -it$sshenvarg $image /bin/bash
+existing_image=""
+if test -n "$container"; then
+    existing_image="`docker ps -f "id=$container" --no-trunc --format "{{.CreatedAt}},{{.ID}}" | sort -r | head -n 1`"
+    if test -z "$existing_image"; then
+        echo "* Container $container not found" 1>&2
+        echo "- To start a new container, try \`cs61-run-docker -f\`" 1>&2
+        echo "- To list executing containers, try \`docker ps\`" 1>&2
+        exit 1
+    elif test "`echo "$existing_image" | wc -l`" -gt 1; then
+        echo "* Container $container ambiguous" 1>&2
+        echo "- To start a new container, try \`cs61-run-docker -f\`" 1>&2
+        echo "- To list executing containers, try \`docker ps\`" 1>&2
+        exit 1
     fi
+elif test -n "$maindir" -a -z "$fresh"; then
+    existing_image="`docker ps -f status=running -f ancestor=$tag -f volume=/host_mnt"$maindir" --no-trunc --format "{{.CreatedAt}},{{.ID}}" | sort -r | head -n 1`"
+fi
+if test -n "$existing_image"; then
+    created_at="`echo $existing_image | sed 's/,.*//'`"
+    image="`echo $existing_image | sed 's/^.*,//'`"
+    image12="`echo $image | head -c 12`"
+    echo "* Using running container $image12, created $created_at" 1>&2
+    echo "- To start a new container, exit then \`cs61-run-docker -f\`" 1>&2
+    echo "- To kill this container, exit then \`docker kill $image12\`" 1>&2
+    vexec docker exec -it$sshenvarg $image /bin/bash
 fi
 
 netarg=

docker/Dockerfile

@@ -85,7 +85,8 @@ ENV LANG=en_US.UTF-8
 RUN rm -r /var/lib/apt/lists/*
 
 # set up passwordless sudo for user cs61-user
-RUN useradd -m -s /bin/bash cs61-user &&\
+ARG UID=1001
+RUN useradd -m -s /bin/bash -u "${UID}" cs61-user &&\
  echo "cs61-user ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/cs61-init
 
 # create binary reporting version of dockerfile

docker/Dockerfile.arm64

@@ -117,7 +117,8 @@ ENV LANG=en_US.UTF-8
 RUN rm -r /var/lib/apt/lists/*
 
 # set up passwordless sudo for user cs61-user
-RUN useradd -m -s /bin/bash cs61-user &&\
+ARG UID=1001
+RUN useradd -m -s /bin/bash -u "${UID}" cs61-user &&\
  echo "cs61-user ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/cs61-init
 
 # create binary reporting version of dockerfile

docker/cs61-build-docker

@@ -4,8 +4,24 @@ cd `dirname $0`
 
 arch="`arch`"
 tag=
+uid=
 platform=
 args=()
+
+# Except on Darwin, adopt current UID by default.
+if test "`uname`" != Darwin; then
+    uid="`id -u`"
+fi
+
+usage () {
+    armtext=
+    if test "$arch" = "arm64" -o "$arch" = "aarch64"; then
+        armtext=" [-a|--arm] [-x|--x86-64] [-u UID]"
+    fi
+    echo "Usage: cs61-build-docker$armtext" 1>&2
+    exit 1
+}
+
 while test "$#" -ne 0; do
     if test "$1" = "-a" -o "$1" = "--arm" -o "$1" = "--arm64"; then
         if test "`arch`" = "arm64" -o "`arch`" = "aarch64"; then
@@ -21,26 +37,47 @@ while test "$#" -ne 0; do
     elif expr "$1" : "--progress=.*" "|" "$1" = "--no-cache" > /dev/null; then
         args+=( "$1" )
         shift
-    else
-        armtext=
-        if test "$arch" = "arm64" -o "$arch" = "aarch64"; then
-            armtext=" [-a|--arm] [-x|--x86-64]"
+    elif test "$1" = "-u" -o "$1" = "--user"; then
+        if expr "$2" : "[0-9][0-9]*$" >/dev/null; then
+            uid="$2"
+            shift 2
+        else
+            usage
+        fi
+    elif expr "$1" : "-u[0-9]*$" "|" "$1" : "--user=[0-9][0-9]*" >/dev/null; then
+        uid="`echo "$1" | sed 's/^[^0-9]*//'`"
+        shift
+    elif test "$1" = "-t" -o "$1" = "--tag"; then
+        if expr "$2" : "..*$" >/dev/null; then
+            tag="$2"
+            shift 2
+        else
+            usage
         fi
-        echo "Usage: cs61-build-docker$armtext" 1>&2
-        exit 1
+    elif expr "$1" : "-t..*$" "|" "$1" : "--tag=..*" >/dev/null; then
+        tag="`echo "$1" | sed 's/^--tag=//;s/^-t//'`"
+        shift
+    else
+        usage
     fi
 done
+
 if test -z "$platform" -a \( "$arch" = "arm64" -o "$arch" = "aarch64" \); then
     platform=linux/arm64
 elif test -z "$platform"; then
     platform=linux/amd64
 fi
+
 if test -z "$tag" -a "$platform" = linux/arm64; then
     tag=cs61:arm64
 elif test -z "$tag"; then
     tag=cs61:latest
 fi
 
+if test -n "$uid"; then
+    args+=( --build-arg UID="$uid" )
+fi
+
 if test $platform = linux/arm64; then
     exec docker build -t "$tag" -f Dockerfile.arm64 --platform linux/arm64 ${args[@]} .
 else