From a23772e702482638548c51c122898a1688868511 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 18 Jun 2023 14:59:36 -0500 Subject: [PATCH 1/2] Ensure VERSION is resolved from existing Fabric install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f93d58ed1fe..a1d2b1904ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.32.1 +ARG MC_HELPER_VERSION=1.32.2 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} # used for cache busting local copy of mc-image-helper ARG MC_HELPER_REV=1 From b6adccc45dfd5ba601fd5c7d66f07211e165105a Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 18 Jun 2023 15:00:25 -0500 Subject: [PATCH 2/2] Cleaned up some of the deployment docs info --- docs/index.md | 10 +++++----- docs/misc/deployment/aws.md | 1 - docs/misc/deployment/docker-compose.md | 26 -------------------------- docs/misc/deployment/helmcharts.md | 8 -------- docs/misc/deployment/index.md | 14 +++++++++++++- 5 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 docs/misc/deployment/aws.md delete mode 100644 docs/misc/deployment/docker-compose.md delete mode 100644 docs/misc/deployment/helmcharts.md diff --git a/docs/index.md b/docs/index.md index 254e4b37551..e251b4d52f0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -29,7 +29,7 @@ where, in this case, the standard server port 25565, will be exposed on your hos **DO NOT** port forward RCON on 25575 without first setting `RCON_PASSWORD` to a secure value. It is highly recommended to only use RCON within the container, such as with `rcon-cli`. -By default, the container will download the latest version of the "vanilla" [Minecraft: Java Edition server](https://www.minecraft.net/en-us/download/server) provided by Mojang. The [`VERSION`](versions/java.md) and the [`TYPE`](types-and-platforms/) can be configured to create many variations of desired Minecraft server. +By default, the container will download the latest version of the "vanilla" [Minecraft: Java Edition server](https://www.minecraft.net/en-us/download/server) provided by Mojang. The [`VERSION`](versions/java.md) and the [`TYPE`](types-and-platforms/index.md) can be configured to create many variations of desired Minecraft server. ## Using [Docker Compose](https://docs.docker.com/compose/) @@ -59,8 +59,8 @@ To apply changes made to the compose file, just run `docker compose up -d` again Follow the logs of the container using `docker compose logs -f`, check on the status with `docker compose ps`, and stop the container using `docker compose stop`. -!!! note "Full Setup Example" - Here is a [reference guide to setting up a server from scratch using docker compose](misc/deployment/docker-compose-full-example/). +!!! note "More Compose Examples" + There are more [examples located in the Github repo](https://github.com/itzg/docker-minecraft-server/tree/master/examples). -!!! note "More Examples" - There are more [examples located in the Github repo](https://github.com/itzg/docker-minecraft-server/tree/master/examples). \ No newline at end of file +!!! note "Deployment Examples" + The [deployments page](misc/deployment/index.md) provides more examples of deployment with and beyond Docker Compose. diff --git a/docs/misc/deployment/aws.md b/docs/misc/deployment/aws.md deleted file mode 100644 index 78e89bc8dee..00000000000 --- a/docs/misc/deployment/aws.md +++ /dev/null @@ -1 +0,0 @@ -If you're looking for a simple way to deploy this to the Amazon Web Services Cloud, check out the [Minecraft Server Deployment (CloudFormation) repository](https://github.com/vatertime/minecraft-spot-pricing). This repository contains a CloudFormation template that will get you up and running in AWS in a matter of minutes. Optionally it uses Spot Pricing so the server is very cheap, and you can easily turn it off when not in use. diff --git a/docs/misc/deployment/docker-compose.md b/docs/misc/deployment/docker-compose.md deleted file mode 100644 index d9aec163799..00000000000 --- a/docs/misc/deployment/docker-compose.md +++ /dev/null @@ -1,26 +0,0 @@ -Rather than type the server options below, the port mappings above, etc -every time you want to create new Minecraft server, you can now use -[Docker Compose](https://docs.docker.com/compose/). Start with a -`docker-compose.yml` file like the following: - -``` yaml -version: "3" - -services: - mc: - image: itzg/minecraft-server - ports: - - 25565:25565 - environment: - EULA: "TRUE" - tty: true - stdin_open: true - restart: unless-stopped -``` - -and in the same directory as that file run - - docker-compose up -d - -Now, go play...or adjust the `environment` section to configure -this server instance. diff --git a/docs/misc/deployment/helmcharts.md b/docs/misc/deployment/helmcharts.md deleted file mode 100644 index 5b4ba9bccad..00000000000 --- a/docs/misc/deployment/helmcharts.md +++ /dev/null @@ -1,8 +0,0 @@ -- itzg Helm Chart: - - [GitHub repo](https://github.com/itzg/minecraft-server-charts) - - [Helm Chart repo](https://itzg.github.io/minecraft-server-charts/) -- [mcsh/server-deployment](https://github.com/mcserverhosting-net/charts) - -### Examples - -The [examples directory](https://github.com/itzg/docker-minecraft-server/tree/master/examples) also provides examples of deploying the [itzg/minecraft-server](https://hub.docker.com/r/itzg/minecraft-server/) Docker image. diff --git a/docs/misc/deployment/index.md b/docs/misc/deployment/index.md index 21e7c36e0c1..af9c47b2e98 100644 --- a/docs/misc/deployment/index.md +++ b/docs/misc/deployment/index.md @@ -1,10 +1,22 @@ +# More Deployment Info + +## Using Helm + +- itzg Helm Chart: + - [GitHub repo](https://github.com/itzg/minecraft-server-charts) + - [Helm Chart repo](https://itzg.github.io/minecraft-server-charts/) +- [mcsh/server-deployment](https://github.com/mcserverhosting-net/charts) + ## Supporting Articles Below are supporting articles for server deployment. - - "Zero to Minecraft Server with Docker Desktop and Compose" https://dev.to/rela-v/zero-to-minecraft-server-with-docker-desktop-and-compose-500a - This is a reference guide/tutorial on how to set up a vanilla Minecraft server using this project, including step-by-step instructions, and information on topics such as port-forwarding. + +## Deploying onto AWS + +If you're looking for a simple way to deploy this to the Amazon Web Services Cloud, check out the [Minecraft Server Deployment (CloudFormation) repository](https://github.com/vatertime/minecraft-spot-pricing). This repository contains a CloudFormation template that will get you up and running in AWS in a matter of minutes. Optionally it uses Spot Pricing so the server is very cheap, and you can easily turn it off when not in use.