From 8d0ab6a083c843737553cbce905c32047535c12f Mon Sep 17 00:00:00 2001 From: J Thompson <104544587+TerminalFault@users.noreply.github.com> Date: Wed, 5 Oct 2022 20:07:06 -0400 Subject: [PATCH 1/4] Create docker-compose-curseforge-atm7.yaml ATM7 CURSEFORGE - Tested 20221005 v.0.4.32 --- examples/docker-compose-curseforge-atm7.yaml | 151 +++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 examples/docker-compose-curseforge-atm7.yaml diff --git a/examples/docker-compose-curseforge-atm7.yaml b/examples/docker-compose-curseforge-atm7.yaml new file mode 100644 index 00000000000..59a9cc8cf04 --- /dev/null +++ b/examples/docker-compose-curseforge-atm7.yaml @@ -0,0 +1,151 @@ +version: '3.8' + +#################################################################### +# CURSEFORGE # +# # +# Date: 20221005 # +# # +# Mod: All The Mods 7 0.4.32 # +# # +# Notes: Verify that there is no EULA file in the modpack.zip # +# if you do not delete it the EULA flag below will be # +# overwritten when the modpack is copied. # +# # +#################################################################### +services: + +#################################################################### +# Service Name # +# # +# Define Service Name here. If using RCON this name will be # +# referenced again as RWA_RCON_HOST below. # +# # +# Example: 'name:' or 'mc_atm6:' # +#################################################################### + mc_atm7: + +#################################################################### +# Image & Container Name # +# # +# Specify Image Name and Java Version. The 'image' will always be # +# 'itzg/minecraft-server' however the tag added to the end is # +# where you can specify the java version or container architecture.# +# See readme.md for a full list. # +# # +# 'container_name:' This can be anything you like. This is the name# +# that will show when you run 'docker ps' commands. # +#################################################################### + image: itzg/minecraft-server + container_name: mc_atm7 + +#################################################################### +# Server Ports # +# # +# Specify external port. # +#################################################################### + ports: + - 25565:25565 + +#################################################################### +# Automatic Server Restart # +# # +# Define a restart policy here. # +# - 'no' = Do not restart. # +# - 'on-failure' = Restart if container exits because an error. # +# - 'always' = Regardless of stop reason. # +# - 'unless-stopped' = Similar to always except if stopped. # +#################################################################### + restart: unless-stopped + +#################################################################### +# Volume and Folder Access # +# # +# This section defines what folders and volumes you want to give # +# this container access to. It is recommended to leaves these set # +# to the default values unless you know what you are doing. # +# # +# Place your mod zip file in a folder called 'modpacks' in the # +# same directory you place this docker-compose file. # +# # +# Specify the data volume name or directory here as well. # +# In this example the volume name is 'data'. When docker creates # +# the volume it will add what ever name you give it here to the # +# end of the container name specified above. In this example it # +# would be named 'mc_atm6_data'. If you change this be sure to # +# update the volume name at the bottom of this config. # +#################################################################### + volumes: + - ./modpacks:/modpacks:ro + - data:/data + +#################################################################### +# EULA # +# # +# Accept EULA by setting to "true" # +#################################################################### + environment: + EULA: "true" + +#################################################################### +# CURSEFORGE INSTALL # +# # +# Sets install type to FORGE and specifys the zip folder name # +# and location of your mod pack. # +# # +# TYPE: Defines the install type as CURSEFORGE # +# # +# CF_SERVER_MOD: Define where the modpack.zip is located. # +# # +# Place your mod zip file in a folder called 'modpacks' in the # +# same directory you place this docker-compose file. # +#################################################################### + TYPE: CURSEFORGE + CF_SERVER_MOD: /modpacks/ATM7-0.4.32-server.zip + +#################################################################### +# Server Memory # +# # +# Set Maximum amount of memory allowed for your server. # +#################################################################### + MEMORY: "8G" + +#################################################################### +# Logging Options # +# # +# Set to "true" to delete old logs # +#################################################################### + ENABLE_ROLLING_LOGS: "true" + +#################################################################### +# Server Timezone # +# # +# Specify server Timezone # +#################################################################### + TZ: "America/New_York" + +#################################################################### +# Minecraft Game Options # +# # +# List any game options you want to define here. A full list can # +# be found on the readme.md page on github. # +#################################################################### + OVERRIDE_SERVER_PROPERTIES: "true" + DIFFICULTY: "easy" + MAX_TICK_TIME: "-1" + VIEW_DISTANCE: "6" + ALLOW_FLIGHT: "true" + OPS: "" + VIEW_DISTANCE: 10 + MAX_PLAYERS: 10 + PVP: "false" + LEVEL_TYPE: "biomesoplenty" + MOTD: "Welcome Home" + +#################################################################### +# Volumes # +# # +# Define data volume name here. You should leave this set to the # +# default. # +#################################################################### +volumes: + data: From 882972a286ee2ba70bf9baba367348ababa09f57 Mon Sep 17 00:00:00 2001 From: J Thompson <104544587+TerminalFault@users.noreply.github.com> Date: Wed, 5 Oct 2022 22:04:27 -0400 Subject: [PATCH 2/4] Create docker-compose-forge-bettermcplus Better Minecraft Plus v40 - FORGE_GENERIC_PACK - Tested 20221005 --- examples/docker-compose-forge-bettermcplus | 161 +++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 examples/docker-compose-forge-bettermcplus diff --git a/examples/docker-compose-forge-bettermcplus b/examples/docker-compose-forge-bettermcplus new file mode 100644 index 00000000000..2a296ad9d23 --- /dev/null +++ b/examples/docker-compose-forge-bettermcplus @@ -0,0 +1,161 @@ +version: '3.8' + +#################################################################### +# FORGE_GENERIC_PACK # +# # +# Date: 20221005 # +# # +# Mod: Better Minecraft Plus v40 # +# # +# Game Version: 1.16.5 # +# # +# Notes: Verify that there is no EULA file in the modpack.zip # +# if you do not delete it the EULA flag below will be # +# overwritten when the modpack is copied. # +# # +#################################################################### +services: + +#################################################################### +# Service Name # +# # +# Define Service Name here. If using RCON this name will be # +# referenced again as RWA_RCON_HOST below. # +# # +# Example: 'name:' or 'mc_atm6:' # +#################################################################### + mc_bmp: + +#################################################################### +# Image & Container Name # +# # +# Specify Image Name and Java Version. The 'image' will always be # +# 'itzg/minecraft-server' however the tag added to the end is # +# where you can specify the java version or container architecture.# +# See readme.md for a full list. # +# # +# 'container_name:' This can be anything you like. This is the name# +# that will show when you run 'docker ps' commands. # +#################################################################### + image: itzg/minecraft-server:java8 + container_name: mc_bmp + +#################################################################### +# Server Ports # +# # +# Specify external port. # +#################################################################### + ports: + - 25565:25565 + +#################################################################### +# Automatic Server Restart # +# # +# Define a restart policy here. # +# - 'no' = Do not restart. # +# - 'on-failure' = Restart if container exits because an error. # +# - 'always' = Regardless of stop reason. # +# - 'unless-stopped' = Similar to always except if stopped. # +#################################################################### + restart: unless-stopped + +#################################################################### +# Volume and Folder Access # +# # +# This section defines what folders and volumes you want to give # +# this container access to. It is recommended to leaves these set # +# to the default values unless you know what you are doing. # +# # +# Place your mod zip file in a folder called 'modpacks' in the # +# same directory you place this docker-compose file. # +# # +# Specify the data volume name or directory here as well. # +# In this example the volume name is 'data'. When docker creates # +# the volume it will add what ever name you give it here to the # +# end of the container name specified above. In this example it # +# would be named 'mc_atm6_data'. If you change this be sure to # +# update the volume name at the bottom of this config. # +#################################################################### + volumes: + - ./modpacks:/modpacks:ro + - data:/data + +#################################################################### +# EULA # +# # +# Accept EULA by setting to "true" # +#################################################################### + environment: + EULA: "true" + +#################################################################### +# FORGE INSTALL # +# # +# Sets install type to FORGE and specifys the zip folder name # +# and location of your mod pack. # +# # +# TYPE: Defines the install type as FORGE # +# # +# VERSION: Defines the version of MC the modpack is based on. # +# # +# FORGEVERSION: Defines the version of FORGE the modpack uses. # +# This can usually be found in the modpack.zip as # +# installer.jar # +# # +# GENERIC_PACK: Define where the modpack.zip is located. # +# # +# Place your mod zip file in a folder called 'modpacks' in the # +# same directory you place this docker-compose file. # +#################################################################### + TYPE: FORGE + VERSION: 1.16.5 + FORGEVERSION: 36.2.39 + GENERIC_PACK: /modpacks/Better+MC+Server+Pack+PLUS+1.16.5+v40+HF.zip + +#################################################################### +# Server Memory # +# # +# Set Maximum amount of memory allowed for your server. # +#################################################################### + MEMORY: "8G" + +#################################################################### +# Logging Options # +# # +# Set to "true" to delete old logs # +#################################################################### + ENABLE_ROLLING_LOGS: "true" + +#################################################################### +# Server Timezone # +# # +# Specify server Timezone # +#################################################################### + TZ: "America/New_York" + +#################################################################### +# Minecraft Game Options # +# # +# List any game options you want to define here. A full list can # +# be found on the readme.md page on github. # +#################################################################### + OVERRIDE_SERVER_PROPERTIES: "true" + DIFFICULTY: "easy" + MAX_TICK_TIME: "-1" + VIEW_DISTANCE: "6" + ALLOW_FLIGHT: "true" + OPS: "" + VIEW_DISTANCE: 10 + MAX_PLAYERS: 10 + PVP: "false" + LEVEL_TYPE: "biomesoplenty" + MOTD: "Welcome Home" + +#################################################################### +# Volumes # +# # +# Define data volume name here. You should leave this set to the # +# default. # +#################################################################### +volumes: + data: From 8a1623d67df38d0839816549aff1862e36119f39 Mon Sep 17 00:00:00 2001 From: J Thompson <104544587+TerminalFault@users.noreply.github.com> Date: Wed, 5 Oct 2022 23:01:38 -0400 Subject: [PATCH 3/4] Delete docker-compose-generic-pack-atm7.yml Removing generic in favor of curseforge. Deleting duplicate. --- examples/docker-compose-generic-pack-atm7.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 examples/docker-compose-generic-pack-atm7.yml diff --git a/examples/docker-compose-generic-pack-atm7.yml b/examples/docker-compose-generic-pack-atm7.yml deleted file mode 100644 index edcfa1b1628..00000000000 --- a/examples/docker-compose-generic-pack-atm7.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3.8' - -services: - mc: - image: itzg/minecraft-server - volumes: - - ./data:/data - - ./modpacks:/modpacks:ro - environment: - EULA: "true" - MEMORY: 2G - TYPE: FORGE - VERSION: 1.18.2 - FORGEVERSION: 40.1.30 - # Need to download Server-Files-0.4.13.zip and - # put it in modpacks directory next to this compose file - GENERIC_PACK: /modpacks/Server-Files-0.4.13.zip - ports: - - "25565:25565" From e657c19f5f6bf171c83eb80fac16bb2e4f07f12d Mon Sep 17 00:00:00 2001 From: J Thompson <104544587+TerminalFault@users.noreply.github.com> Date: Fri, 7 Oct 2022 08:04:24 -0400 Subject: [PATCH 4/4] Update README.md Removed PackWiz GitHub rate limit documentation mentioned in #1678 and fixed in #1725 --- README.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/README.md b/README.md index 602c2998c8f..5881c7195fc 100644 --- a/README.md +++ b/README.md @@ -646,40 +646,6 @@ packwiz modpack defitions are processed before other mod definitions (`MODPACK`, > packwiz is pre-configured to only download server mods. If client-side mods are downloaded and cause issues, check your pack.toml configuration, and make sure any client-only mods are not set to `"both"`, but rather `"client"` for the side configuration item. -### Known Issues: Curl 403 on Startup - -If the container enters a crash-loop or is otherwise rate-limited by Github, you -will see an error similar to, `curl: (22) The requested URL returned error: 403`. - -Packwiz is primarily distributed through Github releases. In order to check if -there are any new releases, this container must call Githubs API. All of the -data that we need to check is public, but trouble happens when Github has reason -to think these calls are a bad-actor. Like if the container gets stuck in a loop -restarting and calls the API too fast or too many times. Simply, this container uses -personal access tokens to tells Github that this system is built by a friendly -human. - -[Manage Your Github's Personal Access Tokens](https://github.com/settings/tokens) - -Create a new personal access token for this container to use. This token will -be used everytime the container is started or restarted so choose an expiration -date that will last for as long as you plan to be operating this container -instance. **The token cannot have any scopes.** This script doesn't need any -scopes what-so-ever to Github and is only being used to signal to Github that -a friendly human is requesting some data. **Do NOT give this token scopes. This -container will refuse to use any token with scopes.** - -To configure server mods using a packwiz modpack and a github token, set the -`PACKWIZ_URL` environment variable to the location of your `pack.toml` modpack -definition and the `GH_TOKEN` to your token's secret value: - - docker run -d -v /path/on/host:/data \ - -p 25565:25565 \ - -e TYPE=FORGE \ - -e "PACKWIZ_URL=https://example.com/modpack/pack.toml" \ - -e "GH_TOKEN"=ghp_chaosofrandomdigitsandletters \ - itzg/minecraft-server - ## Working with mods and plugins ### Optional plugins, mods, and config attach points