diff --git a/deploy.sh b/deploy.sh index 18ad6bb579e381f663c16f001d94ac4b155e6b74..a6502656eaf40639b73204098d7b44c5eee5adbb 100644 --- a/deploy.sh +++ b/deploy.sh @@ -15,30 +15,7 @@ LOCUSER_DIR=`eval echo "~$LOCUSER"` # IFB_DATADIR is set in profile ‘ifb.sh' ln -s $IFB_DATADIR $LOCUSER_DIR/data # Allow local user to run docker -usermod -a -G docker $LOCUSER - -# Manage ephemeral disk -EPHEM_DIR=`df | grep vdb | awk '{print $6}'` -if [ -n "$EPHEM_DIR" ]; then - chown $LOCUSER:$LOCUSER $EPHEM_DIR - ln -s $EPHEM_DIR $IFB_DATADIR/mydatalocal - - # Move docker data dir to ephemeral disk - DOCKER_DJSON=/etc/docker/daemon.json - export DOCKER_DATADIR=${EPHEM_DIR}/docker-data - mkdir $DOCKER_DATADIR - if [ -e $DOCKER_DJSON ] - then - curjson="$(jq '."data-root"=env.DOCKER_DATADIR' $DOCKER_DJSON)" - echo "${curjson}" > $DOCKER_DJSON - else - echo -e "{\n \"data-root\": \"$DOCKER_DATADIR\"\n}" > $DOCKER_DJSON - fi - systemctl restart docker - -else - mkdir $IFB_DATADIR/mydatalocal -fi +mkdir $IFB_DATADIR/mydatalocal # Mount IFB shared volumes ifb_sharedvols=$(ss-get --timeout=5 ifb_share_endpoints)