Simplify variables.sh, unify base image and time zone usage in dockerfile

Author: Tom-Notch

.env

@@ -4,11 +4,14 @@ XAUTH=/tmp/.docker.xauth
 AVAILABLE_CORES=$(($(nproc) - 1))
 
 DOCKER_USER=todo-docker-user
+BASE_IMAGE=todo-base-image
 IMAGE_NAME=todo-image-name
+IMAGE_USER=todo-image-user
 IMAGE_TAG=latest
+TIME_ZONE=$(cat /etc/timezone 2>/dev/null || readlink /etc/localtime | sed 's|.*/zoneinfo/||')
+TIME_ZONE=${TIME_ZONE:-UTC}
 
 CONTAINER_NAME=${IMAGE_NAME}
-IMAGE_USER=todo-image-user
 HOME_FOLDER=/home/${IMAGE_USER}
 CODE_FOLDER=${IMAGE_NAME}
 

README.md

@@ -25,10 +25,11 @@ Docker and singularity is not a must unless you cannot install some dependencies
 
 Continue on a machine where you have docker permission, HPC clusters usually restrict docker access for security reasons
 
-1. Modify `todo-docker-user`, `todo-image-name`, `todo-image-user` in [.env](.env)
+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
 
 1. Modify the service name from `todo-service-name` to your service name in [docker-compose.yml](docker-compose.yml), add additional volume mounting options such as dataset directories

docker/latest/Dockerfile

@@ -1,8 +1,11 @@
 # Do not add --platform=linux/blabla since this is intended for multiplatform builds
-FROM nvidia/cuda:13.0.0-cudnn-devel-ubuntu24.04
+FROM ${BASE_IMAGE}
 ENV HOME=${HOME_FOLDER}
 WORKDIR ${HOME_FOLDER}/
 
+# Make home folder if not exists
+RUN mkdir -p ${HOME_FOLDER}
+
 # Fix apt install stuck problem
 ENV DEBIAN_FRONTEND=noninteractive
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
@@ -23,8 +26,8 @@ RUN apt update -o Acquire::Check-Valid-Until=false -o Acquire::AllowInsecureRepo
 
 # fix local time problem
 RUN apt-get install -y --no-install-recommends tzdata && \
-    ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
-    echo "America/New_York" > /etc/timezone && \
+    ln -fs /usr/share/zoneinfo/${TIME_ZONE} /etc/localtime && \
+    echo "${TIME_ZONE}" > /etc/timezone && \
     dpkg-reconfigure --frontend noninteractive tzdata
 
 # update all obsolete packages to latest, install sudo, and cleanup
@@ -34,7 +37,7 @@ RUN apt update -o Acquire::Check-Valid-Until=false -o Acquire::AllowInsecureRepo
     apt autoremove -y && \
     apt autoclean -y
 
-    # Install some goodies
+# Install some goodies
 RUN apt-get install -y --no-install-recommends \
     build-essential \
     clang-format \

scripts/variables.sh

@@ -8,6 +8,8 @@
 # Copyright Ⓒ 2024 Mukai (Tom Notch) Yu
 #
 
+set -euo pipefail
+
 resolve_host_path() {
 	local p="$1"
 	[ -n "$p" ] || {
@@ -27,24 +29,12 @@ PY
 	fi
 }
 
+set -a
+set +u
 . "$(dirname "$0")"/../.env
+set -u
+set +a
 
-export XSOCK
-export XAUTH
-export AVAILABLE_CORES
-
-export DOCKER_USER
-export IMAGE_NAME
-export IMAGE_TAG
-
-export CONTAINER_NAME
-export IMAGE_USER
-export HOME_FOLDER
-export CODE_FOLDER
-
-export HOST_UID
-export HOST_GID
-export HOST
-export HOSTNAME
-
-export BUILDER
+# export any additional derived variables here if needed, e.g. resolved absolute paths
+# SOME_PATH="$(resolve_host_path "${SOME_PATH:-}")"
+# export SOME_PATH