From a502ac53628f5c91ee69c40d8d04be0aac2a5aeb Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 21 Mar 2023 08:19:19 -0700 Subject: [PATCH 1/7] update --- base-build/debian-bullseye-java_pt1.sh | 59 ++++++++++++++++++++++++++ base-build/debian-bullseye-java_pt2.sh | 19 +++++++++ base-build/debian-bullseye-java_pt3.sh | 33 ++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 base-build/debian-bullseye-java_pt1.sh create mode 100644 base-build/debian-bullseye-java_pt2.sh create mode 100644 base-build/debian-bullseye-java_pt3.sh diff --git a/base-build/debian-bullseye-java_pt1.sh b/base-build/debian-bullseye-java_pt1.sh new file mode 100644 index 0000000..34f3b43 --- /dev/null +++ b/base-build/debian-bullseye-java_pt1.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# Copyright (c) 2018 fithwum +# All rights reserved + +RELEASE=stable + +echo " " +echo "INFO ! Downloading other parts of the script if needed." +if [ -e /debian-bullseye-java_pt2.sh ] + then + echo "INFO ! debian-bullseye-java_pt2.sh found ... will not download." + else + echo " " + echo "WARNING ! debian-bullseye-java_pt2.sh not found ... will download new copy." + wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/master/base-build/debian-bullseye-java_pt2.sh -O /debian-bullseye-java_pt2.sh + chmod +x debian-bullseye-java_pt2.sh +fi +if [ -e /debian-bullseye-java_pt3.sh ] + then + echo "INFO ! debian-bullseye-java_pt3.sh found ... will not download." + else + echo " " + echo "WARNING ! debian-bullseye-java_pt3.sh not found ... will download new copy." + wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/master/base-build/debian-bullseye-java_pt3.sh -O /debian-bullseye-java_pt3.sh + chmod +x debian-bullseye-java_pt3.sh +fi +sleep 1 +echo " " +echo "INFO ! Getting system updates." +apt-get -y update +apt-get -y upgrade +apt-get -y dist-upgrade +apt autoremove -y +echo " " +echo "INFO ! Installing debootstrap,ftp-upload,bash,dirmngr." +sleep 1 +apt-get install -y debootstrap ftp-upload bash dirmngr +sleep 1 +echo " " +echo "INFO ! Downloading debian & selected packages." +debootstrap --keyring /etc/apt/trusted.gpg.d/debian-archive-bullseye-stable.gpg --force-check-gpg --variant=minbase --components=main,contrib,non-free --include=dirmngr,apt-transport-https,wget,bzip2,bash,nano,ca-certificates,software-properties-common,openjdk-17-jdk --arch=amd64 bullseye /debian-bullseye http://deb.debian.org/debian/ +echo " " +echo "INFO ! Filesystem size uncompressed." +sleep 1 +du --human-readable --summarize debian-bullseye +sleep 5 +echo " " +echo "INFO ! Mounting folders for root." +mount --bind /dev debian-bullseye/dev +mount --bind /dev/pts debian-bullseye/dev/pts +mount --bind /proc debian-bullseye/proc +mount --bind /sys debian-bullseye/sys +sleep 1 +cp -v debian-bullseye-java_pt2.sh /debian-bullseye +echo " " +echo "INFO ! Changeing to new root." +sleep 1 +chroot debian-bullseye +exit diff --git a/base-build/debian-bullseye-java_pt2.sh b/base-build/debian-bullseye-java_pt2.sh new file mode 100644 index 0000000..70f72c2 --- /dev/null +++ b/base-build/debian-bullseye-java_pt2.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Copyright (c) 2018 fithwum +# All rights reserved + +echo " " +echo "APT::Get::Assume-Yes \"true\";" | tee /etc/apt/apt.conf.d/10-assume_yes +sleep 1 +echo " " +echo "INFO ! Removeing unnecessary packages." +apt-get remove --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode +sleep 1 +echo " " +echo "INFO ! Cleanup." +apt-get clean +find /var/lib/apt/lists/ -maxdepth 2 -type f -delete +sleep 1 +echo " " +echo "INFO ! Type "exit" and reboot for final steps." +exit diff --git a/base-build/debian-bullseye-java_pt3.sh b/base-build/debian-bullseye-java_pt3.sh new file mode 100644 index 0000000..ae12f08 --- /dev/null +++ b/base-build/debian-bullseye-java_pt3.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright (c) 2018 fithwum +# All rights reserved + +echo " " +echo "INFO ! Cleaning up pt2 of script from base image." +rm -frv /debian-bullseye/debian-bullseye-java_pt2.sh +sleep 1 +echo " " +echo "INFO ! Base image size after cleanup." +du --human-readable --summarize debian-bullseye +sleep 5 +echo " " +echo "INFO ! Creating base image archive." +echo "INFO ! This may take some time." +tar -cjf debian-bullseye.tar.bz2 --directory debian-bullseye . +sleep 1 +echo " " +echo "INFO ! Base image archive." +du --human-readable --summarize debian-bullseye-java.tar.bz2 +sleep 5 +echo " " +echo "INFO ! Uploading image to ftp server." +ftp-upload -v -h {IP}:{PORT} -u {USER} --password {PASSWORD} -d /mnt/user/FTP debian-bullseye-java.tar.bz2 +sleep 1 +echo " " +echo "INFO ! Removing temp files." +rm -fr debian-bullseye +rm -frv debian-bullseye-java.tar.bz2 +echo " " +echo "INFO ! Done." +echo " " +exit From 5cab52e3ca2b9394fc9471cf3d6c7eeffcbc9950 Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 21 Mar 2023 12:31:21 -0700 Subject: [PATCH 2/7] delete --- base-build/debian-bullseye-java_pt1.sh | 59 -------------------------- base-build/debian-bullseye-java_pt2.sh | 19 --------- base-build/debian-bullseye-java_pt3.sh | 33 -------------- 3 files changed, 111 deletions(-) delete mode 100644 base-build/debian-bullseye-java_pt1.sh delete mode 100644 base-build/debian-bullseye-java_pt2.sh delete mode 100644 base-build/debian-bullseye-java_pt3.sh diff --git a/base-build/debian-bullseye-java_pt1.sh b/base-build/debian-bullseye-java_pt1.sh deleted file mode 100644 index 34f3b43..0000000 --- a/base-build/debian-bullseye-java_pt1.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# Copyright (c) 2018 fithwum -# All rights reserved - -RELEASE=stable - -echo " " -echo "INFO ! Downloading other parts of the script if needed." -if [ -e /debian-bullseye-java_pt2.sh ] - then - echo "INFO ! debian-bullseye-java_pt2.sh found ... will not download." - else - echo " " - echo "WARNING ! debian-bullseye-java_pt2.sh not found ... will download new copy." - wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/master/base-build/debian-bullseye-java_pt2.sh -O /debian-bullseye-java_pt2.sh - chmod +x debian-bullseye-java_pt2.sh -fi -if [ -e /debian-bullseye-java_pt3.sh ] - then - echo "INFO ! debian-bullseye-java_pt3.sh found ... will not download." - else - echo " " - echo "WARNING ! debian-bullseye-java_pt3.sh not found ... will download new copy." - wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/master/base-build/debian-bullseye-java_pt3.sh -O /debian-bullseye-java_pt3.sh - chmod +x debian-bullseye-java_pt3.sh -fi -sleep 1 -echo " " -echo "INFO ! Getting system updates." -apt-get -y update -apt-get -y upgrade -apt-get -y dist-upgrade -apt autoremove -y -echo " " -echo "INFO ! Installing debootstrap,ftp-upload,bash,dirmngr." -sleep 1 -apt-get install -y debootstrap ftp-upload bash dirmngr -sleep 1 -echo " " -echo "INFO ! Downloading debian & selected packages." -debootstrap --keyring /etc/apt/trusted.gpg.d/debian-archive-bullseye-stable.gpg --force-check-gpg --variant=minbase --components=main,contrib,non-free --include=dirmngr,apt-transport-https,wget,bzip2,bash,nano,ca-certificates,software-properties-common,openjdk-17-jdk --arch=amd64 bullseye /debian-bullseye http://deb.debian.org/debian/ -echo " " -echo "INFO ! Filesystem size uncompressed." -sleep 1 -du --human-readable --summarize debian-bullseye -sleep 5 -echo " " -echo "INFO ! Mounting folders for root." -mount --bind /dev debian-bullseye/dev -mount --bind /dev/pts debian-bullseye/dev/pts -mount --bind /proc debian-bullseye/proc -mount --bind /sys debian-bullseye/sys -sleep 1 -cp -v debian-bullseye-java_pt2.sh /debian-bullseye -echo " " -echo "INFO ! Changeing to new root." -sleep 1 -chroot debian-bullseye -exit diff --git a/base-build/debian-bullseye-java_pt2.sh b/base-build/debian-bullseye-java_pt2.sh deleted file mode 100644 index 70f72c2..0000000 --- a/base-build/debian-bullseye-java_pt2.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Copyright (c) 2018 fithwum -# All rights reserved - -echo " " -echo "APT::Get::Assume-Yes \"true\";" | tee /etc/apt/apt.conf.d/10-assume_yes -sleep 1 -echo " " -echo "INFO ! Removeing unnecessary packages." -apt-get remove --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode -sleep 1 -echo " " -echo "INFO ! Cleanup." -apt-get clean -find /var/lib/apt/lists/ -maxdepth 2 -type f -delete -sleep 1 -echo " " -echo "INFO ! Type "exit" and reboot for final steps." -exit diff --git a/base-build/debian-bullseye-java_pt3.sh b/base-build/debian-bullseye-java_pt3.sh deleted file mode 100644 index ae12f08..0000000 --- a/base-build/debian-bullseye-java_pt3.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# Copyright (c) 2018 fithwum -# All rights reserved - -echo " " -echo "INFO ! Cleaning up pt2 of script from base image." -rm -frv /debian-bullseye/debian-bullseye-java_pt2.sh -sleep 1 -echo " " -echo "INFO ! Base image size after cleanup." -du --human-readable --summarize debian-bullseye -sleep 5 -echo " " -echo "INFO ! Creating base image archive." -echo "INFO ! This may take some time." -tar -cjf debian-bullseye.tar.bz2 --directory debian-bullseye . -sleep 1 -echo " " -echo "INFO ! Base image archive." -du --human-readable --summarize debian-bullseye-java.tar.bz2 -sleep 5 -echo " " -echo "INFO ! Uploading image to ftp server." -ftp-upload -v -h {IP}:{PORT} -u {USER} --password {PASSWORD} -d /mnt/user/FTP debian-bullseye-java.tar.bz2 -sleep 1 -echo " " -echo "INFO ! Removing temp files." -rm -fr debian-bullseye -rm -frv debian-bullseye-java.tar.bz2 -echo " " -echo "INFO ! Done." -echo " " -exit From ec6db04a6a2503ad1b4b5e16889aea50f22cb52f Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 23 Mar 2023 08:40:30 -0700 Subject: [PATCH 3/7] new docker --- templates/minecraft-fabric_server_unraid.xml | 74 ++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 templates/minecraft-fabric_server_unraid.xml diff --git a/templates/minecraft-fabric_server_unraid.xml b/templates/minecraft-fabric_server_unraid.xml new file mode 100644 index 0000000..b5a1fcb --- /dev/null +++ b/templates/minecraft-fabric_server_unraid.xml @@ -0,0 +1,74 @@ + + + Minecraft-Fabric + fithwum/minecraft-fabric:1.19.3 + https://hub.docker.com/r/fithwum/minecraft-fabric/ + host + + sh + true + false + https://forums.unraid.net/topic/125134-support-fithwum-minecraft-server/ + https://www.minecraft.net/ + This docker will run a Minecraft Fabric server on java 17. + GameServers: + + https://github.com/fithwum/files-for-dockers/templates/minecraft_server_unraid.xml + https://raw.githubusercontent.com/fithwum/files-for-dockers/master/icons/minecraft.png + + + + + Buy me a coffee if you like. + https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2 + This docker will run a Minecraft vanilla server on java 17. + False + 2023-03-23 + + [font size=4][center]Minecraft[/center][/font] + +[font size=3][b](2023-03-23)[/b][/font] +  - First Test. + + + host + + + 25565 + 25565 + tcp + + + + + + + /MCserver/world/ + rw + + + /mnt/user/appdata/minecraft-fabric-server + /MCserver + rw + + + + + 99 + PUID + + + + 100 + PGID + + + + + 25565 + 25565 + + /mnt/user/appdata/minecraft-server + 99 + 100 + From 15baba2496b47453a779058f14d4e3cbd335a061 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 23 Mar 2023 08:45:11 -0700 Subject: [PATCH 4/7] updates --- templates/minecraft_server_unraid.xml | 4 +++- templates/teamspeak_server_unraid.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/minecraft_server_unraid.xml b/templates/minecraft_server_unraid.xml index a80a05e..4052d68 100644 --- a/templates/minecraft_server_unraid.xml +++ b/templates/minecraft_server_unraid.xml @@ -23,7 +23,8 @@ https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2 This docker will run a Minecraft vanilla server on java 17. If you want to run an older version of Minecraft all you need to do is change the tag from latest to the version that you want to run, currently as far back as 1.16.5. False - 2022-06-16 + 2023-03-23 + [font size=4][center]Minecraft[/center][/font] [font size=3][b](2022-06-16)[/b][/font] @@ -33,6 +34,7 @@ [font size=3][b](2020-07-01)[/b][/font]   - First Test. + host diff --git a/templates/teamspeak_server_unraid.xml b/templates/teamspeak_server_unraid.xml index 9d07092..e9ba4f6 100644 --- a/templates/teamspeak_server_unraid.xml +++ b/templates/teamspeak_server_unraid.xml @@ -34,7 +34,7 @@ Connect to the server using the TeamSpeak client with the host IP address and po To authenticate use the privilege key shown in the supervisord.log file in the /ts3-alpine folder. False - 2022-06-16 + 2023-03-23 [font size=4][center]Teamspeak[/center][/font] From fb2279c8d3b49dfd790729ae5cb0c748366bcd4b Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 23 Mar 2023 15:55:44 -0700 Subject: [PATCH 5/7] update/new docker --- templates/minecraft-fabric_server_unraid.xml | 7 +- templates/minecraft-forge_server_unraid.xml | 74 ++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 templates/minecraft-forge_server_unraid.xml diff --git a/templates/minecraft-fabric_server_unraid.xml b/templates/minecraft-fabric_server_unraid.xml index b5a1fcb..db9da0c 100644 --- a/templates/minecraft-fabric_server_unraid.xml +++ b/templates/minecraft-fabric_server_unraid.xml @@ -13,7 +13,7 @@ This docker will run a Minecraft Fabric server on java 17. GameServers: - https://github.com/fithwum/files-for-dockers/templates/minecraft_server_unraid.xml + https://github.com/fithwum/files-for-dockers/templates/minecraft-fabric_server_unraid.xml https://raw.githubusercontent.com/fithwum/files-for-dockers/master/icons/minecraft.png @@ -21,7 +21,7 @@ Buy me a coffee if you like. https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2 - This docker will run a Minecraft vanilla server on java 17. + This docker will run a Minecraft Fabric server on java 17. False 2023-03-23 @@ -30,6 +30,7 @@ [font size=3][b](2023-03-23)[/b][/font]   - First Test. + host @@ -68,7 +69,7 @@ 25565 25565 - /mnt/user/appdata/minecraft-server + /mnt/user/appdata/minecraft-fabric-server 99 100 diff --git a/templates/minecraft-forge_server_unraid.xml b/templates/minecraft-forge_server_unraid.xml new file mode 100644 index 0000000..f64fa68 --- /dev/null +++ b/templates/minecraft-forge_server_unraid.xml @@ -0,0 +1,74 @@ + + + Minecraft-Forge + fithwum/minecraft-forge:1.19.3 + https://hub.docker.com/r/fithwum/minecraft-forge/ + host + + sh + true + false + https://forums.unraid.net/topic/125134-support-fithwum-minecraft-server/ + https://www.minecraft.net/ + This docker will run a Minecraft Forge server on java 17. + GameServers: + + https://github.com/fithwum/files-for-dockers/templates/minecraft-forge_server_unraid.xml + https://raw.githubusercontent.com/fithwum/files-for-dockers/master/icons/minecraft.png + + + + + Buy me a coffee if you like. + https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2 + This docker will run a Minecraft Forge server on java 17. + False + 2023-03-23 + + [font size=4][center]Minecraft[/center][/font] + +[font size=3][b](2023-03-23)[/b][/font] +  - First Test. + + + host + + + 25565 + 25565 + tcp + + + + + + + /MCserver/world/ + rw + + + /mnt/user/appdata/minecraft-forge-server + /MCserver + rw + + + + + 99 + PUID + + + + 100 + PGID + + + + + 25565 + 25565 + + /mnt/user/appdata/minecraft-forge-server + 99 + 100 + From 0a80b4e5c2a46e5940229f7edb66c4d021fac3a7 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 23 Mar 2023 16:19:15 -0700 Subject: [PATCH 6/7] delete --- templates/minecraft-forge_server_unraid.xml | 74 --------------------- 1 file changed, 74 deletions(-) delete mode 100644 templates/minecraft-forge_server_unraid.xml diff --git a/templates/minecraft-forge_server_unraid.xml b/templates/minecraft-forge_server_unraid.xml deleted file mode 100644 index f64fa68..0000000 --- a/templates/minecraft-forge_server_unraid.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - Minecraft-Forge - fithwum/minecraft-forge:1.19.3 - https://hub.docker.com/r/fithwum/minecraft-forge/ - host - - sh - true - false - https://forums.unraid.net/topic/125134-support-fithwum-minecraft-server/ - https://www.minecraft.net/ - This docker will run a Minecraft Forge server on java 17. - GameServers: - - https://github.com/fithwum/files-for-dockers/templates/minecraft-forge_server_unraid.xml - https://raw.githubusercontent.com/fithwum/files-for-dockers/master/icons/minecraft.png - - - - - Buy me a coffee if you like. - https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2 - This docker will run a Minecraft Forge server on java 17. - False - 2023-03-23 - - [font size=4][center]Minecraft[/center][/font] - -[font size=3][b](2023-03-23)[/b][/font] -  - First Test. - - - host - - - 25565 - 25565 - tcp - - - - - - - /MCserver/world/ - rw - - - /mnt/user/appdata/minecraft-forge-server - /MCserver - rw - - - - - 99 - PUID - - - - 100 - PGID - - - - - 25565 - 25565 - - /mnt/user/appdata/minecraft-forge-server - 99 - 100 - From 95530fef22b8bb550c53dd5c93f2592da7648670 Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 29 Aug 2023 12:59:43 -0700 Subject: [PATCH 7/7] updates --- templates/minecraft-fabric_server_unraid.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/minecraft-fabric_server_unraid.xml b/templates/minecraft-fabric_server_unraid.xml index db9da0c..8f2124b 100644 --- a/templates/minecraft-fabric_server_unraid.xml +++ b/templates/minecraft-fabric_server_unraid.xml @@ -1,7 +1,7 @@ Minecraft-Fabric - fithwum/minecraft-fabric:1.19.3 + fithwum/minecraft-fabric:1.20.1 https://hub.docker.com/r/fithwum/minecraft-fabric/ host