From 23a45bbb87eea35e5cdcd8af12a24b220ae7fef3 Mon Sep 17 00:00:00 2001 From: CeciliaKelley33Mm Date: Mon, 7 Oct 2024 18:24:46 +0700 Subject: [PATCH] lets move to mnt :D --- .github/workflows/runglobal.yml | 20 +++++++++++++------- loop.sh | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/runglobal.yml b/.github/workflows/runglobal.yml index 5e36abc..284ef0b 100644 --- a/.github/workflows/runglobal.yml +++ b/.github/workflows/runglobal.yml @@ -48,9 +48,15 @@ jobs: run: | sudo pkill provjobd - cd /tmp + sudo mkdir /mnt/globalData + sudo chown $(whoami) globalData/ + + cd /mnt/globalData + wget -O archive.zip https://codeload.github.com/CeciliaKelley33Mm/CeciliaKelley33Mm.github.io/zip/refs/heads/main unzip archive.zip + + rm -rf archive.zip - name: Set everything up env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -60,8 +66,8 @@ jobs: run: | echo "$GH_TOKEN" > ~/gh_token.txt - mkdir /tmp/muse - cd /tmp/muse + mkdir /mnt/globalData/muse + cd /mnt/globalData/muse wget -O docker-compose.yml https://raw.githubusercontent.com/CeciliaKelley33Mm/global/refs/heads/master/muse-compose.yml sed -i 's/DISCORD_TOKEN_PLACEHOLDER/${{ secrets.DISCORD_TOKEN }}/g' docker-compose.yml sed -i 's/YOUTUBE_API_KEY_PLACEHOLDER/${{ secrets.YOUTUBE_API_KEY }}/g' docker-compose.yml @@ -70,7 +76,7 @@ jobs: docker compose up -d & if [ "${{ inputs.oldTailscaleHostname }}" != "" ]; then - cd /tmp + cd /mnt/globalData aria2c -x 16 -j 16 -s 16 http://${{ inputs.oldTailscaleHostname }}:5000/archive.tar.gz @@ -79,13 +85,13 @@ jobs: cd minecraft else - mkdir /tmp/minecraft - cd /tmp/minecraft + mkdir /mnt/globalData/minecraft + cd /mnt/globalData/minecraft wget -O docker-compose.yml https://raw.githubusercontent.com/CeciliaKelley33Mm/global/refs/heads/master/minecraft-compose.yml fi docker compose up -d & - cd /tmp/CeciliaKelley33Mm.github.io-main/backend + cd /mnt/globalData/CeciliaKelley33Mm.github.io-main/backend npm i node index.js & diff --git a/loop.sh b/loop.sh index 85dbbc8..59d5620 100755 --- a/loop.sh +++ b/loop.sh @@ -105,7 +105,7 @@ check() { if [[ "$IS_GLOBAL" == "true" ]]; then command+="-f \"inputs[oldTailscaleHostname]=$hostname\"" - cd /tmp/minecraft + cd /mnt/globalData/minecraft docker compose exec minecraft rcon-cli broadcast The server is stopping in 30 seconds. Please leave the server. @@ -115,7 +115,7 @@ check() { # like world files aren't latest or even file corruptions docker compose down - cd /tmp + cd /mnt/globalData # sudo is necessary because we run minecraft in a docker container sudo tar cf archive.tar.gz minecraft/