Fix BASE_FOLDER issue when evaluating script on different path

Author: Tom-Notch

.env

@@ -14,7 +14,6 @@ TIME_ZONE=${TIME_ZONE:-UTC}
 CONTAINER_NAME=${IMAGE_NAME}
 HOME_FOLDER=/home/${IMAGE_USER}
 CODE_FOLDER=${IMAGE_NAME}
-BASE_FOLDER=$(pwd)
 
 HOST_UID=$(id -u)
 HOST_GID=$(id -g)

README.md

@@ -27,7 +27,7 @@ Continue on a machine where you have docker permission, HPC clusters usually res
 
 1. Modify `todo-docker-user`, `todo-base-image`, `todo-image-name`, `todo-image-user` in [.env](.env)
 
-   - [.env](env) will be loaded when you use docker compose for build/run/push
+   - [.env](.env) will be loaded when you use docker compose for build/run/push
    - `todo-docker-user` refers to your docker hub account username
    - `todo-base-image` is the image dockerfile is based on, such as `nvidia/cuda:13.0.0-cudnn-devel-ubuntu24.04`
    - `todo-image-user` refers to the default user inside the image, which is used to determine home folder
@@ -47,7 +47,7 @@ Continue on a machine where you have docker permission, HPC clusters usually res
 1. [run_docker_container.sh](scripts/run_docker_container.sh) or `docker compose up -d` to run and test a built image
 
    - The service by default will mount the whole repository onto `CODE_FOLDER` inside the container so any modification inside also takes effect outside, which is useful when you use vscode remote extension to develop inside a running container with remote docker context
-   - You should be able to run and see GUI applications inside the container if `$DISPLAY` is set correctly when you run the script
+   - You should be able to run and see GUI applications inside the container if `DISPLAY` is set correctly when you run the script
 
 1. [push_docker_image.sh](scripts/push_docker_image.sh) to push the multi-arch image to docker hub
 

scripts/run_docker_container.sh

@@ -14,7 +14,7 @@ xhost +local:*
 
 if [ ! -f "${XAUTH}" ]; then
 	touch "${XAUTH}"
-	xauth_list=$(xauth nlist "$DISPLAY" | sed -e 's/^..../ffff/')
+	xauth_list=$(xauth nlist "${DISPLAY}" | sed -e 's/^..../ffff/')
 	if [ -n "${xauth_list}" ]; then
 		echo "${xauth_list}" | xauth -f "${XAUTH}" nmerge -
 	fi
@@ -31,15 +31,16 @@ docker run \
 	--name "${CONTAINER_NAME}" \
 	--hostname "$(hostname)" \
 	--privileged \
-	--cpus "$AVAILABLE_CORES" \
+	--cpus "${AVAILABLE_CORES}" \
+	--user root \
 	--network host \
 	--ipc host \
 	--pid host \
 	--ulimit core=-1 \
 	--group-add audio \
 	--group-add video \
 	--volume=":" \
-	-e DISPLAY="$DISPLAY" \
+	-e DISPLAY="${DISPLAY}" \
 	-e XAUTHORITY="${XAUTH}" \
 	-e QT_X11_NO_MITSHM=1 \
 	-v /var/lib/systemd/coredump/:/cores \

scripts/variables.sh

@@ -38,3 +38,5 @@ set +a
 # export additional derived variables below if needed, e.g. resolved absolute paths
 # SOME_PATH="$(resolve_host_path "${SOME_PATH:-}")"
 # export SOME_PATH
+BASE_FOLDER="$(resolve_host_path "$(dirname "$0")"/..)"
+export BASE_FOLDER