diff --git a/.gitignore b/.gitignore index 27128da..d8b6828 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ # Metadata logs/ + +# Run-Information +.tools/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b989014..354d479 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,86 +1,19 @@ -version: "2" +version: "3.8" networks: backend: + external: true + name: minecraft-backend services: - # Minecraft Network Proxy Server - mc-bungeecord: - image: itzg/bungeecord - container_name: mc_bungeecord - mem_limit: 2GB - environment: - BUNGEE_JAR_REVISION: "1" - CFG_MOTD: Powered by Docker - REPLACE_ENV_VARIABLES: "true" - SPIGET_PLUGINS: "241,8695,68956,80677,95509" - # External Download: - # - LuckPerms BungeeCord https://luckperms.net/download - ports: - - "25565:25577" - networks: - - backend - volumes: - - ./mc-bungeecord:/server - - ./mc-bungeecord/config.yml:/config/config.yml + # >> Moved to Stack mc-bungeecord/docker-compose.yml # Minecraft Survival Server - mc-survival: - image: itzg/minecraft-server - container_name: mc_survival - mem_limit: 6GB - environment: - TYPE: "SPIGOT" - EULA: "TRUE" - MEMORY: "" - JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" - ONLINE_MODE: "FALSE" - SPIGET_RESOURCES: "70616,7688,73997,34315,51856,16708,92546,28140,80677" - # External Download: - # - Emotecraft https://github.com/KosmX/emotes/releases/latest - # - 9089 EssentialsX https://essentialsx.net/downloads.html?branch=stable - # - 1884 GriefPrevention https://dev.bukkit.org/projects/grief-prevention/files/3173411 - # - 93738 SimpleVoiceChat https://www.curseforge.com/minecraft/bukkit-plugins/simple-voice-chat/files/all - # - 1.19 Update-Issues 1997 ProtocolLib https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/ - #ports: - # - "24454:24454" - tty: true - stdin_open: true - restart: unless-stopped - networks: - - backend - volumes: - - ./mc-survival:/data - - ./logs/survival.log:/data/logs/latest.log + # >> Moved to Stack mc-survival/docker-compose.yml # Minecraft Lobby, Creative, Minigames Server - mc-main: - image: itzg/minecraft-server - container_name: mc_main - mem_limit: 6GB - environment: - TYPE: "PAPER" - EULA: "TRUE" - MEMORY: "" - JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" - ONLINE_MODE: "FALSE" - SPIGET_RESOURCES: "390,6245,7688,25391,63714,70616,28140,1166,80677,53036" - # External Download: - # - Emotecraft https://github.com/KosmX/emotes/releases/latest - # - 51321 AntiCooldown https://www.spigotmc.org/resources/anticooldown-1-9-1-18.51321/ - # - 77506 PlotSquared https://www.spigotmc.org/resources/plotsquared-v6.77506/ - # - 13932 Fast Async WorldEdit https://ci.athion.net/job/FastAsyncWorldEdit-1.17/lastStableBuild/ - ports: - - "60606:60606" - tty: true - stdin_open: true - restart: unless-stopped - networks: - - backend - volumes: - - ./mc-main:/data - - ./logs/main.log:/data/logs/latest.log + # >> Moved to Stack mc-main/docker-compose.yml # Nginx Proxy for Mod-support mc-mod-proxy: @@ -104,4 +37,4 @@ services: MYSQL_DATABASE: mc-btm MYSQL_USER: minecraft MYSQL_PASSWORD: development-minecraft-password-todo - command: --default-authentication-plugin=mysql_native_password + command: --default-authentication-plugin=mysql_native_password \ No newline at end of file diff --git a/docker-create-network.sh b/docker-create-network.sh new file mode 100644 index 0000000..547ff4e --- /dev/null +++ b/docker-create-network.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Encryption only needed if Connected Servers are on different Machines +#docker network create --opt encrypted --driver overlay --attachable minecraft-backend +docker network create --driver overlay --attachable minecraft-backend \ No newline at end of file diff --git a/logs/survival.log b/logs/survival.log deleted file mode 100644 index bf83c6c..0000000 --- a/logs/survival.log +++ /dev/null @@ -1 +0,0 @@ -This is an example, to allow docker-compose to recognice the Mount as a file. diff --git a/mc-bungeecord/.env b/mc-bungeecord/.env new file mode 100644 index 0000000..bcd78e9 --- /dev/null +++ b/mc-bungeecord/.env @@ -0,0 +1,6 @@ +BUNGEE_JAR_REVISION: "1" +CFG_MOTD: Powered by Docker +REPLACE_ENV_VARIABLES: "true" +SPIGET_PLUGINS: "241,8695,68956,80677,95509" +# External Download: +# - LuckPerms BungeeCord https://luckperms.net/download \ No newline at end of file diff --git a/mc-bungeecord/docker-compose.yml b/mc-bungeecord/docker-compose.yml new file mode 100644 index 0000000..10de4e0 --- /dev/null +++ b/mc-bungeecord/docker-compose.yml @@ -0,0 +1,20 @@ +version: "3.8" + +networks: + backend: + external: true + name: minecraft-backend + +services: + # Minecraft Network Proxy Server + mc-bungeecord: + image: itzg/bungeecord + hostname: mc-bungeecord + env_file: .env + ports: + - "25565:25577" + networks: + - backend + volumes: + - ./mc-bungeecord:/server + - ./mc-bungeecord/config.yml:/config/config.yml \ No newline at end of file diff --git a/mc-bungeecord/.gitignore b/mc-bungeecord/server/.gitignore similarity index 100% rename from mc-bungeecord/.gitignore rename to mc-bungeecord/server/.gitignore diff --git a/mc-bungeecord/config.yml b/mc-bungeecord/server/config.yml similarity index 100% rename from mc-bungeecord/config.yml rename to mc-bungeecord/server/config.yml diff --git a/mc-bungeecord/plugins/BungeeTeleportManager/config.yml b/mc-bungeecord/server/plugins/BungeeTeleportManager/config.yml similarity index 100% rename from mc-bungeecord/plugins/BungeeTeleportManager/config.yml rename to mc-bungeecord/server/plugins/BungeeTeleportManager/config.yml diff --git a/mc-bungeecord/plugins/SlashServer/config.yml b/mc-bungeecord/server/plugins/SlashServer/config.yml similarity index 100% rename from mc-bungeecord/plugins/SlashServer/config.yml rename to mc-bungeecord/server/plugins/SlashServer/config.yml diff --git a/mc-main/.env b/mc-main/.env new file mode 100644 index 0000000..eb0fedd --- /dev/null +++ b/mc-main/.env @@ -0,0 +1,11 @@ +TYPE: "PAPER" +EULA: "TRUE" +MEMORY: "" +JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" +ONLINE_MODE: "FALSE" +SPIGET_RESOURCES: "390,6245,7688,25391,63714,70616,28140,1166,80677,53036" +# External Download: +# - Emotecraft https://github.com/KosmX/emotes/releases/latest +# - 51321 AntiCooldown https://www.spigotmc.org/resources/anticooldown-1-9-1-18.51321/ +# - 77506 PlotSquared https://www.spigotmc.org/resources/plotsquared-v6.77506/ +# - 13932 Fast Async WorldEdit https://ci.athion.net/job/FastAsyncWorldEdit-1.17/lastStableBuild/ \ No newline at end of file diff --git a/mc-main/docker-compose.yml b/mc-main/docker-compose.yml new file mode 100644 index 0000000..15861c3 --- /dev/null +++ b/mc-main/docker-compose.yml @@ -0,0 +1,18 @@ +version: '3.8' + +networks: + backend: + external: true + name: minecraft-backend + +services: + mc-main: + image: itzg/minecraft-server + hostname: mc-main + env_file: .env +# ports: +# - "60606:60606" + networks: + - backend + volumes: + - ./mc-main:/data \ No newline at end of file diff --git a/mc-main/.gitignore b/mc-main/server/.gitignore similarity index 100% rename from mc-main/.gitignore rename to mc-main/server/.gitignore diff --git a/mc-main/commands.yml b/mc-main/server/commands.yml similarity index 100% rename from mc-main/commands.yml rename to mc-main/server/commands.yml diff --git a/mc-main/plugins/BungeeTeleportManager/config.yml b/mc-main/server/plugins/BungeeTeleportManager/config.yml similarity index 100% rename from mc-main/plugins/BungeeTeleportManager/config.yml rename to mc-main/server/plugins/BungeeTeleportManager/config.yml diff --git a/mc-survival/.env b/mc-survival/.env new file mode 100644 index 0000000..b07f2f5 --- /dev/null +++ b/mc-survival/.env @@ -0,0 +1,12 @@ +TYPE: "SPIGOT" +EULA: "TRUE" +MEMORY: "" +JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" +ONLINE_MODE: "FALSE" +SPIGET_RESOURCES: "70616,7688,73997,34315,51856,16708,92546,28140,80677" +# External Download: +# - Emotecraft https://github.com/KosmX/emotes/releases/latest +# - 9089 EssentialsX https://essentialsx.net/downloads.html?branch=stable +# - 1884 GriefPrevention https://dev.bukkit.org/projects/grief-prevention/files/3173411 +# - 93738 SimpleVoiceChat https://www.curseforge.com/minecraft/bukkit-plugins/simple-voice-chat/files/all +# - 1.19 Update-Issues 1997 ProtocolLib https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/ \ No newline at end of file diff --git a/mc-survival/docker-compose.yml b/mc-survival/docker-compose.yml new file mode 100644 index 0000000..264f075 --- /dev/null +++ b/mc-survival/docker-compose.yml @@ -0,0 +1,18 @@ +version: '3.8' + +networks: + backend: + external: true + name: minecraft-backend + +services: + mc-survival: + image: itzg/minecraft-server + hostname: mc-survival + env_file: .env + #ports: + # - "24454:24454" + networks: + - backend + volumes: + - ./mc-survival:/data \ No newline at end of file diff --git a/mc-survival/.gitignore b/mc-survival/server/.gitignore similarity index 100% rename from mc-survival/.gitignore rename to mc-survival/server/.gitignore diff --git a/mc-survival/bukkit.yml b/mc-survival/server/bukkit.yml similarity index 100% rename from mc-survival/bukkit.yml rename to mc-survival/server/bukkit.yml diff --git a/mc-survival/commands.yml b/mc-survival/server/commands.yml similarity index 100% rename from mc-survival/commands.yml rename to mc-survival/server/commands.yml diff --git a/mc-survival/permissions.yml b/mc-survival/server/permissions.yml similarity index 100% rename from mc-survival/permissions.yml rename to mc-survival/server/permissions.yml diff --git a/mc-survival/server.properties b/mc-survival/server/server.properties similarity index 100% rename from mc-survival/server.properties rename to mc-survival/server/server.properties diff --git a/mc-survival/spigot.yml b/mc-survival/server/spigot.yml similarity index 100% rename from mc-survival/spigot.yml rename to mc-survival/server/spigot.yml