Compare commits

..
6 changed files with 12 additions and 26 deletions
+2 -2
View File
@@ -139,7 +139,7 @@ jobs:
uses: docker/setup-qemu-action@v3.6.0 uses: docker/setup-qemu-action@v3.6.0
- name: Build for test - name: Build for test
uses: docker/build-push-action@v6.17.0 uses: docker/build-push-action@v6.16.0
with: with:
platforms: linux/amd64 platforms: linux/amd64
tags: ${{ env.IMAGE_TO_TEST }} tags: ${{ env.IMAGE_TO_TEST }}
@@ -177,7 +177,7 @@ jobs:
password: ${{ github.token }} password: ${{ github.token }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@v6.17.0 uses: docker/build-push-action@v6.16.0
if: github.actor == github.repository_owner if: github.actor == github.repository_owner
with: with:
platforms: ${{ matrix.platforms }} platforms: ${{ matrix.platforms }}
+2 -2
View File
@@ -56,7 +56,7 @@ jobs:
uses: docker/setup-buildx-action@v3.10.0 uses: docker/setup-buildx-action@v3.10.0
- name: Confirm multi-arch build - name: Confirm multi-arch build
uses: docker/build-push-action@v6.17.0 uses: docker/build-push-action@v6.16.0
with: with:
platforms: ${{ matrix.platforms }} platforms: ${{ matrix.platforms }}
# ensure latest base image is used # ensure latest base image is used
@@ -66,7 +66,7 @@ jobs:
cache-from: type=gha,scope=${{ matrix.variant }} cache-from: type=gha,scope=${{ matrix.variant }}
- name: Build for test - name: Build for test
uses: docker/build-push-action@v6.17.0 uses: docker/build-push-action@v6.16.0
with: with:
# Only build single platform since loading multi-arch image into daemon fails with # Only build single platform since loading multi-arch image into daemon fails with
# "docker exporter does not currently support exporting manifest lists" # "docker exporter does not currently support exporting manifest lists"
+1 -1
View File
@@ -50,7 +50,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \ --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
ARG MC_HELPER_VERSION=1.41.9 ARG MC_HELPER_VERSION=1.41.10
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
# used for cache busting local copy of mc-image-helper # used for cache busting local copy of mc-image-helper
ARG MC_HELPER_REV=1 ARG MC_HELPER_REV=1
+1 -1
View File
@@ -1,4 +1,4 @@
mkdocs-material == 9.6.14 mkdocs-material == 9.6.12
mkdocs-autorefs == 1.4.1 mkdocs-autorefs == 1.4.1
mkdocstrings[python] == 0.29.1 mkdocstrings[python] == 0.29.1
mkdocs-literate-nav == 0.6.2 mkdocs-literate-nav == 0.6.2
+4 -2
View File
@@ -14,8 +14,10 @@ services:
# Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
CF_API_KEY: ${CF_API_KEY} CF_API_KEY: ${CF_API_KEY}
CF_SLUG: all-the-mods-10 CF_SLUG: all-the-mods-10
# Optional: select a specific version/file # Or reference a specific modpack file/version using CF_PAGE_URL, such as this one for 2.47
# CF_FILENAME_MATCHER: "1.17" # CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-the-mods-10/files/6502777
# Optional: select a specific version/file when using CF_SLUG
# CF_FILENAME_MATCHER: "2.47"
MEMORY: 4G MEMORY: 4G
CF_OVERRIDES_EXCLUSIONS: | CF_OVERRIDES_EXCLUSIONS: |
shaderpacks/** shaderpacks/**
+2 -18
View File
@@ -28,7 +28,6 @@
"clickable-advancements", "clickable-advancements",
"compass-coords", "compass-coords",
"configured", "configured",
"controllable",
"controlling", "controlling",
"craftpresence", "craftpresence",
"ctm", "ctm",
@@ -38,7 +37,6 @@
"ding", "ding",
"drippy-loading-screen", "drippy-loading-screen",
"dynamic-surroundings", "dynamic-surroundings",
"dynamic-view",
"dynamiclights-reforged", "dynamiclights-reforged",
"easiervillagertrading", "easiervillagertrading",
"effective-forge", "effective-forge",
@@ -46,25 +44,20 @@
"embeddium-extension", "embeddium-extension",
"embeddium-extras", "embeddium-extras",
"enchantment-descriptions", "enchantment-descriptions",
"enhanced-boss-bars",
"enhancedvisuals", "enhancedvisuals",
"entity-collision-fps-fix", "entity-collision-fps-fix",
"entity-model-features", "entity-model-features",
"entity-texture-features-fabric", "entity-texture-features-fabric",
"entityculling", "entityculling",
"equipment-compare", "equipment-compare",
"essential-mod",
"euphoria-patches", "euphoria-patches",
"extreme-sound-muffler", "extreme-sound-muffler",
"ezzoom", "ezzoom",
"fading-night-vision", "fading-night-vision",
"falling-leaves-forge", "falling-leaves-forge",
"fancymenu", "fancymenu",
"farsight",
"faster-ladder-climbing", "faster-ladder-climbing",
"flerovium",
"foamfix-optimization-mod", "foamfix-optimization-mod",
"forgeskyboxes",
"fps-reducer", "fps-reducer",
"free-cam", "free-cam",
"ftb-backups-2", "ftb-backups-2",
@@ -72,7 +65,6 @@
"hwyla", "hwyla",
"iceberg", "iceberg",
"ignitioncoil", "ignitioncoil",
"illager-raid-music",
"inmisaddon", "inmisaddon",
"iris-flywheel-compat", "iris-flywheel-compat",
"irisshaders", "irisshaders",
@@ -88,10 +80,8 @@
"legendary-tooltips", "legendary-tooltips",
"lighty", "lighty",
"loot-capacitor-tooltips", "loot-capacitor-tooltips",
"loot-journal",
"lootbeams", "lootbeams",
"magnesium-extras", "magnesium-extras",
"make-bubbles-pop",
"menumobs", "menumobs",
"minecraft-rich-presence", "minecraft-rich-presence",
"model-gap-fix", "model-gap-fix",
@@ -105,12 +95,10 @@
"oculus", "oculus",
"oldjavawarning", "oldjavawarning",
"overloaded-armor-bar", "overloaded-armor-bar",
"particular",
"packmenu", "packmenu",
"packmodemenu", "packmodemenu",
"particular",
"particular-reforged",
"reauth", "reauth",
"rebind-narrator",
"reblured", "reblured",
"reeses-sodium-options", "reeses-sodium-options",
"reforgium", "reforgium",
@@ -134,9 +122,9 @@
"sodium-options-api", "sodium-options-api",
"sodium-rubidium-occlusion-culling-fix", "sodium-rubidium-occlusion-culling-fix",
"sound", "sound",
"sound-reloader",
"sound-filters", "sound-filters",
"sound-physics-remastered", "sound-physics-remastered",
"sound-reloader",
"stellar-sky", "stellar-sky",
"swingthroughgrass", "swingthroughgrass",
"textrues-embeddium-options", "textrues-embeddium-options",
@@ -150,7 +138,6 @@
"vanillafix", "vanillafix",
"visuality", "visuality",
"waila-harvestability", "waila-harvestability",
"wakes-reforged",
"wawla", "wawla",
"xaeroplus", "xaeroplus",
"yungs-menu-tweaks", "yungs-menu-tweaks",
@@ -160,9 +147,6 @@
"all-of-fabric-6": { "all-of-fabric-6": {
"forceIncludes": ["revelationary"] "forceIncludes": ["revelationary"]
}, },
"beyond-depth": {
"forceIncludes": ["particular-reforged"]
},
"create-arcane-engineering": { "create-arcane-engineering": {
"forceIncludes": ["just-enough-resources-jer"] "forceIncludes": ["just-enough-resources-jer"]
}, },