Update Docker setup.

Author: kohler

docker/Dockerfile

@@ -88,7 +88,7 @@ RUN useradd -m -s /bin/bash cs61-user && \
  echo "cs61-user ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/cs61-init
 
 # create binary reporting version of dockerfile
-RUN (echo '#\!/bin/sh'; echo 'echo 14') > /usr/bin/cs61-docker-version; chmod ugo+rx,u+w,go-w /usr/bin/cs61-docker-version
+RUN (echo '#\!/bin/sh'; echo 'echo 15') > /usr/bin/cs61-docker-version; chmod ugo+rx,u+w,go-w /usr/bin/cs61-docker-version
 
 # git build arguments
 ARG USER=CS61\ User
@@ -103,6 +103,7 @@ RUN git config --global user.name "${USER}" && \
  cat /dev/null > ~/.bash_profile && \
  echo "# 2022: avoid a Docker bug with user mapping by listing working directory" >> ~/.bash_profile && \
  echo "ls -al > /dev/null" >> ~/.bash_profile && \
+ echo "for i in \`mount | grep /home/cs61-user | sed 's/^.*\\(\\/home[^ ]*\\).*/\\\\1/'\`; do ls -al \$i > /dev/null; done" >> ~/.bash_profile && \
  echo "# make ssh-auth.sock user-readable" >> ~/.bash_profile && \
  (echo "if test -f /run/host-services/ssh-auth.sock; then"; echo "  sudo chown cs61-user:cs61-user /run/host-services/ssh-auth.sock"; echo "fi") >> ~/.bash_profile && \
  echo ". ~/.bashrc" >> ~/.bash_profile && \

docker/Dockerfile.arm64

@@ -120,7 +120,7 @@ RUN useradd -m -s /bin/bash cs61-user && \
  echo "cs61-user ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/cs61-init
 
 # create binary reporting version of dockerfile
-RUN (echo '#\!/bin/sh'; echo 'if test "x$1" = x-n; then echo 13; else echo 13.arm64; fi') > /usr/bin/cs61-docker-version; chmod ugo+rx,u+w,go-w /usr/bin/cs61-docker-version
+RUN (echo '#\!/bin/sh'; echo 'if test "x$1" = x-n; then echo 15; else echo 15.arm64; fi') > /usr/bin/cs61-docker-version; chmod ugo+rx,u+w,go-w /usr/bin/cs61-docker-version
 
 # git build arguments
 ARG USER=CS61\ User
@@ -132,7 +132,12 @@ RUN git config --global user.name "${USER}" && \
  git config --global user.email "${EMAIL}" && \
  (echo "(custom-set-variables"; echo " '(c-basic-offset 4)"; echo " '(indent-tabs-mode nil))") > ~/.emacs && \
  (echo "set expandtab"; echo "set shiftwidth=4"; echo "set softtabstop=4") > ~/.vimrc && \
- (echo "if test -f /run/host-services/ssh-auth.sock; then"; echo "  sudo chown cs61-user:cs61-user /run/host-services/ssh-auth.sock"; echo "fi") > ~/.bash_profile && \
+ cat /dev/null > ~/.bash_profile && \
+ echo "# 2022: avoid a Docker bug with user mapping by listing working directory" >> ~/.bash_profile && \
+ echo "ls -al > /dev/null" >> ~/.bash_profile && \
+ echo "for i in \`mount | grep /home/cs61-user | sed 's/^.*\\(\\/home[^ ]*\\).*/\\\\1/'\`; do ls -al \$i > /dev/null; done" >> ~/.bash_profile && \
+ echo "# make ssh-auth.sock user-readable" >> ~/.bash_profile && \
+ (echo "if test -f /run/host-services/ssh-auth.sock; then"; echo "  sudo chown cs61-user:cs61-user /run/host-services/ssh-auth.sock"; echo "fi") >> ~/.bash_profile && \
  echo ". ~/.bashrc" >> ~/.bash_profile && \
  echo "export PATH=/usr/x86_64-linux-gnu/bin:\$PATH" >> ~/.bashrc && \
  rm -f ~/.bash_logout && \

docker/README.md

@@ -126,7 +126,7 @@ cs61-lectures
 cs61-user@a15e6c4c8dbe:~$ echo "Hello, world"
 Hello, world
 cs61-user@a15e6c4c8dbe:~$ cs61-docker-version
-14
+15
 cs61-user@a15e6c4c8dbe:~$ exit
 exit
 $