From b3e66d97993318e91c0ff634fec62978f6530785 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Wed, 23 Nov 2022 10:19:19 +0100 Subject: facilitate starting a test container without using `mount` to create the host directories container expects to exist --- guix-container.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'guix-container.sh') diff --git a/guix-container.sh b/guix-container.sh index 9218a54..f844b5d 100755 --- a/guix-container.sh +++ b/guix-container.sh @@ -27,18 +27,20 @@ fi PIDFILE=/run/guix-container.pid EXECUTABLE=/usr/local/bin/guix-container LOG_DIR=/var/log/guix-container +WWW_DIR=/var/www MAX_CONTAINER_SPINUP_WAIT=60 ACTION="$1" shift OPTIND=1 -while getopts qe:p:l:L: OPTION_LETTER ; do +while getopts p:e:l:w:s: OPTION_LETTER ; do case "$OPTION_LETTER" in p) PIDFILE="$OPTARG" ;; e) EXECUTABLE="$OPTARG" ;; l) LOG_DIR="$OPTARG" ;; - w) MAX_CONTAINER_SPINUP_WAIT="$OPTARG" ;; + w) WWW_DIR="$OPTARG" ;; + s) MAX_CONTAINER_SPINUP_WAIT="$OPTARG" ;; esac done @@ -79,14 +81,12 @@ onexit() { } start() { - KOSZKO_SIDELOAD_REAL=/var/www/koszko.org/html - KOSZKO_SIDELOAD_INSIDE=/srv/http/koszko.org + KOSZKO_SIDELOAD_REAL="$WWW_DIR"/koszko.org/html LOG_REAL="$LOG_DIR"/container - LOG_INSIDE=/var/log - HTTP_DIR_SHARE_OPT=--share="$KOSZKO_SIDELOAD_REAL"="$KOSZKO_SIDELOAD_INSIDE" - LOG_DIR_SHARE_OPT=--share="$LOG_REAL"="$LOG_INSIDE" - mkdir -p "$(dirname "$LOG_DIR")" + HTTP_DIR_SHARE_OPT=--share="$KOSZKO_SIDELOAD_REAL"=/srv/http/koszko.org + LOG_DIR_SHARE_OPT=--share="$LOG_REAL"=/var/log + mkdir --mode=700 -p "$LOG_DIR" mkdir --mode=700 -p "$LOG_DIR"/container -- cgit v1.2.3