diff --git a/scripts/bootstrap-volumes.sh b/scripts/bootstrap-volumes.sh index 1e330fa..067de21 100755 --- a/scripts/bootstrap-volumes.sh +++ b/scripts/bootstrap-volumes.sh @@ -9,12 +9,12 @@ for VOLUME_NAME in $DESKTOP_ENVIRONMENT_VOLUMES; do VOLUME_PATH=$(printenv $VOLUME_NAME) - # Give the desktop environment container user ownership of the volume + # Give the desktop environment user ownership of the volume docker run \ --rm \ --user root \ --volume $VOLUME_NAME:$VOLUME_PATH \ - $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \ + $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$DESKTOP_ENVIRONMENT_BRANCH \ chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $VOLUME_PATH & done diff --git a/scripts/build.sh b/scripts/build.sh index 0e34abe..d5b6a03 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -6,5 +6,5 @@ export $($REPO_ROOT/scripts/environment.sh) docker build \ --build-arg DESKTOP_CONTAINER_BUILD_DATE=$(date +%s) \ --build-arg DESKTOP_CONTAINER_GIT_SHA=$(git --git-dir $REPO_ROOT/.git rev-parse HEAD | cut -b 1-7) \ - --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \ + --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$DESKTOP_ENVIRONMENT_BRANCH \ $REPO_ROOT diff --git a/scripts/environment.sh b/scripts/environment.sh index c46446f..3eea413 100755 --- a/scripts/environment.sh +++ b/scripts/environment.sh @@ -1,5 +1,4 @@ REPO_ROOT=$(dirname $(realpath $0))/.. -GIT_BRANCH=$(git --git-dir $REPO_ROOT/.git rev-parse --abbrev-ref HEAD) # Desktop environment container user DESKTOP_ENVIRONMENT_USER=jackson @@ -8,6 +7,7 @@ DESKTOP_ENVIRONMENT_HOME=/$DESKTOP_ENVIRONMENT_USER/home DESKTOP_ENVIRONMENT_REGISTRY=sabrehagen # Desktop environment repository configuration +echo DESKTOP_ENVIRONMENT_BRANCH=$(git --git-dir $REPO_ROOT/.git rev-parse --abbrev-ref HEAD) echo DESKTOP_ENVIRONMENT_CONTAINER=$DESKTOP_ENVIRONMENT_CONTAINER echo DESKTOP_ENVIRONMENT_USER=$DESKTOP_ENVIRONMENT_USER echo DESKTOP_ENVIRONMENT_REGISTRY=$DESKTOP_ENVIRONMENT_REGISTRY diff --git a/scripts/push.sh b/scripts/push.sh index 40a4a4f..50adec1 100755 --- a/scripts/push.sh +++ b/scripts/push.sh @@ -3,4 +3,4 @@ REPO_ROOT=$(dirname $(realpath $0))/.. # Export desktop environment shell configuration export $($REPO_ROOT/scripts/environment.sh) -docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH +docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$DESKTOP_ENVIRONMENT_BRANCH diff --git a/scripts/start.sh b/scripts/start.sh index 0498f54..85dec4a 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -50,7 +50,7 @@ docker run \ --volume DESKTOP_ENVIRONMENT_USER_REPOSITORIES:$DESKTOP_ENVIRONMENT_USER_REPOSITORIES \ --volume DESKTOP_ENVIRONMENT_USER_VIDEOS:$DESKTOP_ENVIRONMENT_USER_VIDEOS \ --workdir $DESKTOP_ENVIRONMENT_HOME \ - $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH + $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$DESKTOP_ENVIRONMENT_BRANCH # Wait until the desktop environment container is running before proceeding until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER | grep Status | grep -m 1 running >/dev/null; do sleep 1; done