From 3143f63402e5955c17ae4ea3e5bfd739874b8a74 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Thu, 28 Feb 2019 22:35:17 +1100 Subject: [PATCH] env-fix --- host/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/host/bootstrap.sh b/host/bootstrap.sh index 6f7142c..92f4a5e 100755 --- a/host/bootstrap.sh +++ b/host/bootstrap.sh @@ -89,7 +89,7 @@ gosu $DESKTOP_ENVIRONMENT_USER vcsh clone https://sabrehagen@github.com/sabrehag gosu $DESKTOP_ENVIRONMENT_USER vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-zsh.git # Pre-cache development environment container -docker pull $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_BRANCH &>/dev/null +docker pull $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$DESKTOP_ENVIRONMENT_BRANCH &>/dev/null # Pre-cache development environment support container docker pull jare/x11-bridge:latest &>/dev/null @@ -100,10 +100,10 @@ $REPO_ROOT/docker/scripts/clone.sh # Create a boot entry for the desktop environment DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH=/var/lib/docker/volumes/$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY/_data$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY if [ "$1" = "--xpra" ]; then - echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/start-xpra.sh; exit 0" > /etc/init.d/$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME + echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/start-xpra.sh; exit 0" > /etc/init.d/$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER else - echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/start.sh; exit 0" > /etc/init.d/$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME + echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/start.sh; exit 0" > /etc/init.d/$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER fi # Start the environment on host startup -ln -s /etc/init.d/$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME /etc/rc2.d/S02$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME +ln -s /etc/init.d/$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER /etc/rc2.d/S02$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER