diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml index 1def9d0..886ff18 100644 --- a/.github/workflows/on-tag-only.yml +++ b/.github/workflows/on-tag-only.yml @@ -55,7 +55,7 @@ jobs: with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} - draft: false + draft: true prerelease: false - name: Upload image diff --git a/stage2/05-docker-compose/00-packages b/stage2/05-docker-compose/00-packages index 0899c29..ac938b3 100644 --- a/stage2/05-docker-compose/00-packages +++ b/stage2/05-docker-compose/00-packages @@ -1 +1,2 @@ -git \ No newline at end of file +git +fswatch \ No newline at end of file diff --git a/stage2/05-docker-compose/01-run.sh b/stage2/05-docker-compose/01-run.sh index b9777bb..0281d8c 100755 --- a/stage2/05-docker-compose/01-run.sh +++ b/stage2/05-docker-compose/01-run.sh @@ -6,7 +6,7 @@ echo "Installing docker-compose from pip3, and also setting up the box folder st on_chroot << EOF pip3 install docker-compose cd /home/${FIRST_USER_NAME} -wget -qO- "https://raw.githubusercontent.com/getumbrel/umbrel/v0.1.3-beta/install-box.sh" | sh +wget -qO- "https://raw.githubusercontent.com/getumbrel/umbrel/v0.1.4-beta/install-box.sh" | sh chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} /home/${FIRST_USER_NAME} EOF @@ -31,7 +31,7 @@ cp files/compose-service ${ROOTFS_DIR}/etc/init.d/umbrelbox echo "Pulling Docker images required to run Umbrel services" -wget -q "https://raw.githubusercontent.com/getumbrel/umbrel/v0.1.3-beta/docker-compose.yml" +wget -q "https://raw.githubusercontent.com/getumbrel/umbrel/v0.1.4-beta/docker-compose.yml" IMAGES=$(grep '^\s*image' docker-compose.yml | sed 's/image://' | sed 's/\"//g' | sed '/^$/d;s/[[:blank:]]//g' | sort | uniq) echo "List of images to download: $IMAGES" diff --git a/stage2/05-docker-compose/files/compose-service b/stage2/05-docker-compose/files/compose-service index 262caf6..a9d0037 100644 --- a/stage2/05-docker-compose/files/compose-service +++ b/stage2/05-docker-compose/files/compose-service @@ -16,29 +16,30 @@ set -e NAME="compose-service" DESCRIPTION="Docker compose service" SCRIPTNAME=/etc/init.d/$NAME +UMBREL_ROOT=/home/umbrel case "$1" in start) - if [ -f /home/umbrel/docker-compose.yml ]; then - sed -i 's/\${HOME}/\/home\/umbrel/g; ' /home/umbrel/docker-compose.yml - echo "Starting" - cd /home/umbrel + if [ -f $UMBREL_ROOT/docker-compose.yml ]; then + cd $UMBREL_ROOT + echo "Starting karen" + ./karen & + echo "Starting Umbrel Docker services" docker-compose up --build -d exit 0 else - echo "Docker-compose file doesn't exist" + echo "Cannot start umbrelbox service. No docker-compose.yml found in $UMBREL_ROOT" exit 1 fi ;; stop) - if [ -f /home/umbrel/docker-compose.yml ]; then - sed -i 's/\${HOME}/\/home\/umbrel/g; ' /home/umbrel/docker-compose.yml - echo "Stopping docker" - cd /home/umbrel + if [ -f $UMBREL_ROOT/docker-compose.yml ]; then + echo "Stopping Umbrel Docker services" + cd $UMBREL_ROOT docker-compose down exit 0 else - echo "Docker-compose file doesn't exist" + echo "Cannot stop umbrelbox service. No docker-compose.yml found in $UMBREL_ROOT" exit 1 fi ;;