From e6bc8abdc14e1bbb8a4fb059540f7d187b008131 Mon Sep 17 00:00:00 2001 From: Niek Candaele <22315101+niekcandaele@users.noreply.github.com> Date: Thu, 27 May 2021 13:41:05 +0100 Subject: [PATCH 1/5] fix: update Sky Factory version link (#898) --- examples/modpacks/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/modpacks/README.md b/examples/modpacks/README.md index 8adbed9b..789183e1 100644 --- a/examples/modpacks/README.md +++ b/examples/modpacks/README.md @@ -1,3 +1,3 @@ Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory. -The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from . +The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from . From fb0babe2614d1ba76b4adfe215640353f98f9a3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 08:02:39 -0500 Subject: [PATCH 2/5] build(deps): bump docker/setup-qemu-action from 1.1.0 to 1.2.0 (#902) --- .github/workflows/build-multiarch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 9311a321..6eff7dc8 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -56,7 +56,7 @@ jobs: ${{ runner.os }}-buildx- - name: Set up QEMU - uses: docker/setup-qemu-action@v1.1.0 + uses: docker/setup-qemu-action@v1.2.0 - name: Login to DockerHub uses: docker/login-action@v1 From d60c2e08158a1dee5a05b1b963cd19fc000e9480 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 08:03:12 -0500 Subject: [PATCH 3/5] build(deps): bump actions/cache from 2.1.5 to 2.1.6 (#903) --- .github/workflows/build-multiarch.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 6eff7dc8..9d911404 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -47,7 +47,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00bc22bb..aa639938 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,7 +59,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} From 491800280c61f0e3ef248997c44b547542413cf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 12:33:42 -0500 Subject: [PATCH 4/5] build(deps): bump docker/build-push-action from 2.4.0 to 2.5.0 (#904) --- .github/workflows/build-multiarch.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 9d911404..647f33c5 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -66,7 +66,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2.4.0 + uses: docker/build-push-action@v2.5.0 with: context: . platforms: linux/amd64,linux/arm/v7,linux/arm64 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa639938..bd715089 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2.4.0 + uses: docker/build-push-action@v2.5.0 with: context: . file: ./Dockerfile From 90cfe0e151d7b0b1728b85c9f2a342091a786e00 Mon Sep 17 00:00:00 2001 From: Erik Selberg Date: Sat, 5 Jun 2021 15:46:59 -0700 Subject: [PATCH 5/5] fix bad find statement in CurseForge handling (#901) Co-authored-by: Erik Selberg Co-authored-by: Geoff Bourne --- start-deployCF | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/start-deployCF b/start-deployCF index 3508bc00..345f4132 100644 --- a/start-deployCF +++ b/start-deployCF @@ -85,13 +85,14 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then fi log "Installing forge server" - (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer) + dirOfInstaller=$(dirname "${forgeInstallerJar}") + (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer) fi echo "${FTB_SERVER_MOD}" > $installMarker fi - export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) + export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print) if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then log "ERROR unable to locate installed forge server jar" isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar" @@ -184,7 +185,7 @@ if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then # Allow up to 2 levels since some modpacks have a top-level directory named # for the modpack - forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer') + forgeJar=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print) if [[ "$forgeJar" ]]; then export FTB_BASE_DIR=$(dirname "${forgeJar}") log "No entry script found, so building one for ${forgeJar}"