Index: docker/run =================================================================== --- docker/run (revision 19048) +++ docker/run (working copy) @@ -75,8 +75,8 @@ # Option parsing # Options -shortopts=dhi:m:Mp:r:t:vVu:cC -longopts=download-data,help,ietfdb-url=,mysqldata=,no-mysqldir,port=,docker-repo=,tag=,verbose,version,user=,cached,no-cached +shortopts=dhi:m:Mp:r:t:vVu:cCD: +longopts=download-data,help,ietfdb-url=,mysqldata=,no-mysqldir,port=,docker-repo=,tag=,verbose,version,user=,cached,no-cached,db-opt= # Default values MYSQLDIR=$parent/data/mysql @@ -86,6 +86,7 @@ DBURL=https://www.ietf.org/lib/dt/sprint/ietf_utf8.bin.tar.bz2 WHO=$(whoami) CACHED='' +DBOPT='' if [ "$(uname)" = "Linux" ]; then args=$(getopt -o "$shortopts" --long "$longopts" -n '$program' -- $SV "$@") @@ -108,6 +109,7 @@ -c| --cached) CACHED=':cached';; # Use cached disk access to reduce system load -C| --no-cached) CACHED='';; # Use fully synchronized disk access -d| --download-data) DOWNLOAD=1;; # Download and set up the database files + -D| --db-opt) DBOPT=":$2"; shift;; # Use delegated/cached/etc disk access for db to reduce system load -h| --help) usage; exit;; # Show this help, then exit -f| --filedir) FILEDIR=$2; shift;; # Set the desired location of drafts, charters etc. -i| --ietfdb-url) DBURL=$2; shift;; # Use an alternative database tarball URL @@ -263,7 +265,7 @@ "$REPO:$TAG" "$@" else docker run -ti -p $PORT:8000 -v "$HOME:/home/$WHO$CACHED" \ - -v "$MYSQLDIR:/var/lib/mysql" -e USER="$WHO" \ + -v "$MYSQLDIR:/var/lib/mysql$DBOPT" -e USER="$WHO" \ -e DATADIR="${parent#$HOME/}/data" -e CWD="${PWD#$HOME/}" -e TAG="$TAG" \ -e FILEDIR=${FILEDIR#$HOME} -e UID="$WHOUID" -e GID="$WHOGID" \ "$REPO:$TAG" "$@"