From 09d05919ad730062cc5929c72477e28dd58bf8cf841b182c74b9fad33f89fcbd Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Fri, 25 Apr 2025 14:06:51 +0200 Subject: [PATCH 01/29] add another WIP --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index eb4b42c..54153c1 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,9 @@ MMS-client-min is a symbolic modpack, which isn't meant to be 'installed'. It's ### MMS-server Installation WIP +## Building Instructions +WIP + ## Licensing & Credits - This project is *mostly* licensed under the [AGPL-3.0-or-later](./LICENSE). - The "client" and "server" modpacks are based on [Simply Optimized](https://modrinth.com/modpack/sop) by "HyperSoop", which has it's own license at . From f4fe014e50acf2915a8452cfb05d3a084b2dea8139ca147cd3a4510aca5a7349 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Fri, 25 Apr 2025 15:53:39 +0200 Subject: [PATCH 02/29] update Description & Licensing and add MMS-full (WIP) --- README.md | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 54153c1..11cbef0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -## MMS - Description +## About MMS This is a **M**odded **M**inecraft **S**erver project, mostly a modpack. (please tell me a better name than MMS, I'm open for suggestions) -The modpack is centralised around the [Create mod](https://github.com/Fabricators-of-Create/Create). Why Create? Because it's a cool mod, obviously! +MMS is centralised around the [Create mod](https://github.com/Fabricators-of-Create/Create). Why Create? Because it's a cool mod, obviously! Apart from that there are 4 goals: - Only add features and functionality to the game, keep the vanilla features and functionality untouched. Complex Redstone contraptions, for example, which are supposed to work in vanilla, should also work with the MMS modpack. - Find a middle ground between being too minimalistic and too bloated. @@ -10,11 +10,22 @@ Apart from that there are 4 goals: Based on these goals everything else is decided. That's why the mod loader is [Fabric](https://fabricmc.net/), which is lightweight and doesn't change Minecraft's vanilla behaviour. - -The 'modpack' is actually separated into two modpacks: MMS-client and MMS-server. The later is supposed to run on a server, the first is supposed to run on a client and connect to the server. +**If the Create mod and these goals appeal to you, MMS might be just the thing!** + +The 'MMS' project is separated into three modpacks: +- **MMS-full** combines MMS-client and MMS-server, providing the full MMS experience in Singleplayer as well. It may however run less smoothly than MMS-client on your computer. +- **MMS-client** is for use with MMS-server and is more lightweight than MMS-full by excluding server-only features like world generation mods. It can also be used in Singleplayer, without the full MMS experience and requires less resources than MMS-full. +- **MMS-server** is to be used on a dedicated server. It contains Mods with functionality only on servers. + Additionally, MMS-client-min is provided as information on how to make a client compatible with the server. It's only the bare minimum to achieve compatibility. It also includes optional mods, which the server provides supports for. They are `.disabled` by default. + Explicit contents: +
+MMS-full +WIP +
+
MMS-client WIP @@ -59,10 +70,14 @@ WIP - This project is *mostly* licensed under the [AGPL-3.0-or-later](./LICENSE). - The "client" and "server" modpacks are based on [Simply Optimized](https://modrinth.com/modpack/sop) by "HyperSoop", which has it's own license at . - **Excluded** from the [AGPL-3.0-or-later](./LICENSE) are - - all "mods" (jar binaries), as each has their own open-source license (Except for Xaero's World Map, which is closed-source). You can find them in the "mods" folders: + - all "mods" (jar binaries), as each has their own license (most of which are open-source). You can find them in the "mods" folders: - [./client/mods](./client/mods) - [./client-min/mods](./client-min/mods) - [./server/server/mods](./server/server/mods) + - These mods are licensed All Rights Reserved: + - Xaero's World Map, closed-source + - What Are They Up To (Watut), [source available](https://github.com/Corosauce/WATUT) + - dependency CoroUtil, [source available](https://github.com/Corosauce/CoroUtil) - all resourcepacks in [./client/resourcepacks](./client/resourcepacks) as I (anonoe) do not own them. I distribute them with the permission granted by Vanilla Tweaks [here](https://vanillatweaks.net/terms/). - all datapacks in [./server/server/world/datapacks](./server/server/world/datapacks) as I (anonoe) do not own them. I distribute them with the permission granted by Vanilla Tweaks [here](https://vanillatweaks.net/terms/) and by Stardust Labs [here](https://github.com/Stardust-Labs-MC/Structory/blob/v1.3.5/license.txt) and [here](https://github.com/Stardust-Labs-MC/Structory-Towers/blob/v1.0.7/license.txt). - the fabric-server-mc...loader...launcher...jar file(s) located at [./server/server](./server/server) by FabricMC licensed under the [Apache-2.0 License](https://github.com/FabricMC/fabric-installer/?tab=Apache-2.0-1-ov-file#readme) From f1dab581cf80271aa036514fa5dd1b39f9bc68c966cd698d2e64de2a072e5951 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Fri, 25 Apr 2025 18:27:30 +0200 Subject: [PATCH 03/29] actually update servers.dat? --- client/minecraft/servers.dat | Bin 11018 -> 22038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/client/minecraft/servers.dat b/client/minecraft/servers.dat index bd03a82a3166f76d11549e648beea94d4092a2cb92db6d20881d7ad9a7b98868..0a61b06227e47f7a51a5eef51132bd6b66491c9022cb59827b9685a8f06d4175 100644 GIT binary patch delta 86 zcmeAQo3@5gh>L-NlYzZBwWut$s2Ip$VA?43U2CJz4J}h4U*BMbkksOm%)E4kV6X}f k2Bypc2L8Ony!@0(y_8fdBU4i|Ge!osjLejj)I6Ye04wMh{{R30 delta 35 pcmbQXhOsM5h>L-NlYzZBwWut$s2Ip$VBE~9eM4*VD=m3O1^}b}2^9bU From 0abce5bc8ddc1a0fa2b23b47c8135c33b884e088bf218e91dd306fe1bf9bfea6 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Fri, 25 Apr 2025 21:00:29 +0200 Subject: [PATCH 04/29] fix download link in installation instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11cbef0..7fd7bee 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ This will allow PrismLauncher to generate a token, which grants temporary access #### 3. Import the modpack On the top left "Add Instance -> Import". Paste the following link: -`https://git.nanody.de/api/packages/anonoe/generic/MMS-client/3.0-Release-Candidate-02-init/MMS-client_3.0-RC-02-init.zip` +`https://git.nanody.de/api/packages/anonoe/generic/MMS-client/3.0/MMS-client_3.0-init.zip` and press "OK". #### 4. Launch game and join server Select the instance and press "Launch". Have a little patience for the downloads to finish and the game to launch. Finally join the server, if you are whitelisted. From 93100efc255243f2c92685bc17d55037f760626a6673e749118b9dbb128b4d8f Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Sat, 26 Apr 2025 00:17:52 +0200 Subject: [PATCH 05/29] compose now more specific about port mapping --- server/compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/compose.yml b/server/compose.yml index f2a4329..1c7584d 100644 --- a/server/compose.yml +++ b/server/compose.yml @@ -1,13 +1,13 @@ version: '3.8' services: - jre-hl-mc: + jre-hl-mc-MMS: image: alp-jre-21-hl:latest volumes: - ./server:/mnt/server working_dir: /mnt/server command: ["java", "-Xmx4G", "-Xms1G", "-jar", "minecraft_server.jar", "--nogui"] ports: - - "25565:25565" # minecraft - - "24454:24454" # simple voicechat + - "25565:25565/tcp" # minecraft + - "24454:24454/udp" # simple voicechat tty: true # restart: unless-stopped From 7cc3771b5ca80781f51863bfc2fda25d0974ffb1e68f795cb7c31d85a7ac9f30 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Sat, 26 Apr 2025 00:50:00 +0200 Subject: [PATCH 06/29] update MOTD --- server/server/server.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server/server.properties b/server/server/server.properties index a7fab40..4a26654 100644 --- a/server/server/server.properties +++ b/server/server/server.properties @@ -38,7 +38,7 @@ op-permission-level=3 function-permission-level=2 broadcast-console-to-ops=true broadcast-rcon-to-ops=true -motd=\u00A72\u00A7n3.0\u00A7r \u00A76\u00A7lCreate Expansion\u00A7r\u00A7r\nwill be here \u00A7o(soon)\u00A7r in \u00A7kx\u00A7r working days +motd=\u00A72\u00A7n3.0\u00A7r \u00A76\u00A7lCreate Expansion\u00A7r\n\u00A7k3.0\u00A7r Out Now! \u00A7k3.0 #Server server-ip= From 83bf7b79aad85d7fd27a832ba0d2c6dcbbc23e15732ecadd1240aa6afbb631c4 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Fri, 9 May 2025 23:03:34 +0200 Subject: [PATCH 07/29] view-distance=32 set view-distance from default 10 to the maximum 32 --- server/server/server.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server/server.properties b/server/server/server.properties index 4a26654..07d7b09 100644 --- a/server/server/server.properties +++ b/server/server/server.properties @@ -7,7 +7,7 @@ difficulty=normal hardcore=false pvp=true simulation-distance=10 -view-distance=10 +view-distance=32 allow-flight=false allow-nether=true spawn-animals=true From 02ab723e3ac55bb254f13ff98faf2134bb83174d33c176055ed310b40b20c58a Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 20:53:09 +0200 Subject: [PATCH 08/29] JRE container build automation --- .forgejo/workflows/build-push-jre-alpine.yml | 39 ++++++++++++++++++++ server/alp-jre-21-hl/Containerfile | 3 -- server/buildenv-jre-alpine/Containerfile | 3 ++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 .forgejo/workflows/build-push-jre-alpine.yml delete mode 100644 server/alp-jre-21-hl/Containerfile create mode 100644 server/buildenv-jre-alpine/Containerfile diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml new file mode 100644 index 0000000..34cf7dd --- /dev/null +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -0,0 +1,39 @@ +on: + push: + branches: + - 'main' + tags: + - 'jre-alpine*.**/v**' + paths: + - 'server/buildenv-jre-alpine' + schedule: + - cron: '0 0 1-31 1-12 1' + +jobs: + build_push: + runs-on: ubuntu-latest + steps: + - + name: Checkout Repository + uses: actions/checkout@v5 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + git.nanody.de/anonoe/jre-alpine + tags: | + type=semver,pattern={{raw}}/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} + type=semver,pattern={{version}},match=v(\d.\d.\d)$ + type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ + type=semver,pattern={{major}},match=v(\d.\d.\d)$ + - + name: Build and push jre-alpine + uses: docker/build-push-action@v6 + with: + context: ./server/buildenv-jre-alpine/ + file: ./server/buildenv-jre-alpine/Containerfile + push: false + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/server/alp-jre-21-hl/Containerfile b/server/alp-jre-21-hl/Containerfile deleted file mode 100644 index ba5b734..0000000 --- a/server/alp-jre-21-hl/Containerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM alpine:latest - -RUN apk add --no-cache openjdk21-jre-headless diff --git a/server/buildenv-jre-alpine/Containerfile b/server/buildenv-jre-alpine/Containerfile new file mode 100644 index 0000000..4105cb9 --- /dev/null +++ b/server/buildenv-jre-alpine/Containerfile @@ -0,0 +1,3 @@ +FROM alpine:3.20 + +RUN apk add --no-cache openjdk21-jre-headless rcon From 7e36ed2cda9c309aa82208c0fdfcbf8a2f9e65caad099528e739f9398e1d5746 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 21:06:20 +0200 Subject: [PATCH 09/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 34cf7dd..da7dc17 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -1,11 +1,10 @@ on: + [workflow_dispatch] push: branches: - 'main' tags: - 'jre-alpine*.**/v**' - paths: - - 'server/buildenv-jre-alpine' schedule: - cron: '0 0 1-31 1-12 1' From 3254258006b6a2299288d6951d49de2e0cab07248ece0d2281051a245b56cfb1 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 21:10:54 +0200 Subject: [PATCH 10/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index da7dc17..13641e1 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -1,5 +1,5 @@ on: - [workflow_dispatch] + workflow_dispatch: push: branches: - 'main' From 12d6eb6426f9dc4ee579731fd17fa8b03a01698ed64d2fb4107ce85f252f30c4 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 21:46:48 +0200 Subject: [PATCH 11/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 13641e1..a152eac 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -14,7 +14,10 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v5 + #uses: actions/checkout@v5 + uses: github.com/yangskyboxlabs/action-checkout/tree/sha256@v4-sha256 + with: + object-format: 'sha256' - name: Docker meta id: meta From 105f61a83a08068e21abea527aa3cd824867895047c3df1683deb80b5b2a7323 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 21:50:18 +0200 Subject: [PATCH 12/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index a152eac..18bd026 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout Repository #uses: actions/checkout@v5 - uses: github.com/yangskyboxlabs/action-checkout/tree/sha256@v4-sha256 + uses: https://github.com/yangskyboxlabs/action-checkout/tree/sha256@v4-sha256 with: object-format: 'sha256' - From 6032ca31b97531893f6bb77e7e755c48d57072a7a381499badb87f4af2200e2e Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:02:55 +0200 Subject: [PATCH 13/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 18bd026..798e7b9 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout Repository #uses: actions/checkout@v5 - uses: https://github.com/yangskyboxlabs/action-checkout/tree/sha256@v4-sha256 + uses: https://github.com/yangskyboxlabs/action-checkout/tree/v4-sha256@v4-sha256 with: object-format: 'sha256' - From 140a3071a6bc0c2ccae73b69b026c6627e827863c31d011625c7470d73dcae68 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:08:29 +0200 Subject: [PATCH 14/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 798e7b9..88977f4 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout Repository #uses: actions/checkout@v5 - uses: https://github.com/yangskyboxlabs/action-checkout/tree/v4-sha256@v4-sha256 + uses: https://github.com/yangskyboxlabs/action-checkout@sha256 with: object-format: 'sha256' - From 8ba427f90ccd2f9620fd9e91292e9298f43e45e9d789409b1242dbda0c44d412 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:12:27 +0200 Subject: [PATCH 15/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 88977f4..d8a2662 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -1,8 +1,6 @@ on: workflow_dispatch: push: - branches: - - 'main' tags: - 'jre-alpine*.**/v**' schedule: @@ -36,6 +34,6 @@ jobs: with: context: ./server/buildenv-jre-alpine/ file: ./server/buildenv-jre-alpine/Containerfile - push: false + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 4a27a84adf32584ac60e78cb6a1749fad58bb1d456abb06d8ba8df5e12542e3a Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:28:45 +0200 Subject: [PATCH 16/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index d8a2662..db93ac8 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -16,6 +16,13 @@ jobs: uses: https://github.com/yangskyboxlabs/action-checkout@sha256 with: object-format: 'sha256' + - + name: Login to Container Registry + uses: docker/login-action@v3 + with: + registry: git.nanody.de + username: ${{ forgejo.actor }} + password: ${{ secrets.PACKAGES_RW }} - name: Docker meta id: meta From ffc42f40a2f4db51a8db3639444a8941daadb024aff3d28dedd4868b8534f785 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:33:17 +0200 Subject: [PATCH 17/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index db93ac8..7f8a1ca 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -21,7 +21,7 @@ jobs: uses: docker/login-action@v3 with: registry: git.nanody.de - username: ${{ forgejo.actor }} + username: ${{ github.actor }} password: ${{ secrets.PACKAGES_RW }} - name: Docker meta From 32747ca00b354cb72320355ea921a3ca15dc654b812449e58ff514e7e173f93f Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:36:23 +0200 Subject: [PATCH 18/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 7f8a1ca..89ebd6e 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -32,9 +32,9 @@ jobs: git.nanody.de/anonoe/jre-alpine tags: | type=semver,pattern={{raw}}/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} - type=semver,pattern={{version}},match=v(\d.\d.\d)$ - type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ - type=semver,pattern={{major}},match=v(\d.\d.\d)$ + #type=semver,pattern={{version}},match=v(\d.\d.\d)$ + #type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ + #type=semver,pattern={{major}},match=v(\d.\d.\d)$ - name: Build and push jre-alpine uses: docker/build-push-action@v6 From 7e539ec3bfe76879853d4887185164d1c8329e941e782006dc0805a78e57aab7 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:39:10 +0200 Subject: [PATCH 19/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 89ebd6e..7f8a1ca 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -32,9 +32,9 @@ jobs: git.nanody.de/anonoe/jre-alpine tags: | type=semver,pattern={{raw}}/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} - #type=semver,pattern={{version}},match=v(\d.\d.\d)$ - #type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ - #type=semver,pattern={{major}},match=v(\d.\d.\d)$ + type=semver,pattern={{version}},match=v(\d.\d.\d)$ + type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ + type=semver,pattern={{major}},match=v(\d.\d.\d)$ - name: Build and push jre-alpine uses: docker/build-push-action@v6 From 2133e479519f9105be4d21d837d371080351262da70cf8b699e1b2649593dfb7 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 22:59:56 +0200 Subject: [PATCH 20/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 7f8a1ca..5afc9ec 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -31,7 +31,8 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=semver,pattern={{raw}}/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} + type=semver,pattern={{raw}} + #/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ From 0d54907996ff43537a33462a5a8fd952b7051e431a429fc3cd77a856723c3f66 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 23:08:11 +0200 Subject: [PATCH 21/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 5afc9ec..bb80f9e 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -31,8 +31,7 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=semver,pattern={{raw}} - #/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} + type=semver,pattern={{major}}-{{raw}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'},match=v(\d.\d.\d)$ type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ @@ -44,4 +43,4 @@ jobs: file: ./server/buildenv-jre-alpine/Containerfile push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + #labels: ${{ steps.meta.outputs.labels }} From ea6aa6581bb9cf29777d7125f6f05cdd3e5ddde6f30fd6b842f2a99f7d74bc8c Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 23:09:33 +0200 Subject: [PATCH 22/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index bb80f9e..37461e7 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -31,7 +31,7 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=semver,pattern={{major}}-{{raw}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'},match=v(\d.\d.\d)$ + type=semver,pattern={{major}}-{{raw}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},match=v(\d.\d.\d)$ type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ From ea348fc5cdfedd119f9ff096378ad96d744f44ce4216b69749ccab716c96a6c0 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 23:21:53 +0200 Subject: [PATCH 23/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 37461e7..401ec35 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -31,7 +31,7 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=semver,pattern={{major}}-{{raw}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},match=v(\d.\d.\d)$ + type=semver,pattern={{major}}-{{raw}},suffix={{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},match=v(\d.\d.\d)$ type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ From ca7fa0d669b55d90ba33f144c46ae0b730bf85c3d839e5e140fbf96f996c8712 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 23:39:59 +0200 Subject: [PATCH 24/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 401ec35..9dd147b 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -31,7 +31,8 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=semver,pattern={{major}}-{{raw}},suffix={{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},match=v(\d.\d.\d)$ + type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} + type=schedule,pattern=nightly,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ From fb06b37ec1bcfad5fd2c055dc0508c6fcfafc65326fdf1596c3539acf619b37a Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 23:41:24 +0200 Subject: [PATCH 25/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 9dd147b..d360c98 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -31,7 +31,7 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} + type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},value= type=schedule,pattern=nightly,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ From ea9a82a7a73c2a4032035be1915d0947e219c8d096d353ad3f80fda17922c19e Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Mon, 8 Sep 2025 23:50:42 +0200 Subject: [PATCH 26/29] workflow patch --- .forgejo/workflows/build-push-jre-alpine.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index d360c98..8b04837 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -13,7 +13,8 @@ jobs: - name: Checkout Repository #uses: actions/checkout@v5 - uses: https://github.com/yangskyboxlabs/action-checkout@sha256 + #uses: https://github.com/yangskyboxlabs/action-checkout@sha256 + uses: https://git.nanody.de/anonoe/action-checkout@sha256 with: object-format: 'sha256' - From b9662202cf2ea67ff60b6c76e607158185bb5be14b2a9cd6ac7992399ed493ee Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Tue, 9 Sep 2025 20:50:17 +0200 Subject: [PATCH 27/29] jre-alpine3.20 -> jre-alpine3.22 --- server/buildenv-jre-alpine/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/buildenv-jre-alpine/Containerfile b/server/buildenv-jre-alpine/Containerfile index 4105cb9..26fcaa3 100644 --- a/server/buildenv-jre-alpine/Containerfile +++ b/server/buildenv-jre-alpine/Containerfile @@ -1,3 +1,3 @@ -FROM alpine:3.20 +FROM alpine:3.22 RUN apk add --no-cache openjdk21-jre-headless rcon From 2252bb8a5a4c28ab40a7271983be3d82d8ca92874a400e92cb681851da7bf256 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Thu, 18 Sep 2025 16:28:45 +0200 Subject: [PATCH 28/29] workflow: fix "raw" entry incompatible with scheduled run --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 8b04837..fe8b553 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -32,7 +32,7 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},value= + #type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},value= type=schedule,pattern=nightly,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ From 92212b73619b0fc3c2db2c8c49b49359cd8ee561c59dceb2a5dec152b7b21c31 Mon Sep 17 00:00:00 2001 From: anonoe <8bdd1ef7-1633-4e26-83a0-8dda8605bcd0@aleeas.com> Date: Thu, 18 Sep 2025 16:38:22 +0200 Subject: [PATCH 29/29] workflow: fix comment "raw" entry possibly messing with tags --- .forgejo/workflows/build-push-jre-alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index fe8b553..0eff078 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -32,11 +32,11 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - #type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},value= type=schedule,pattern=nightly,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ + # type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},value= - name: Build and push jre-alpine uses: docker/build-push-action@v6