From ce42a627eaa9d462000eb0678ed6f1488cb5c0f4 Mon Sep 17 00:00:00 2001 From: Egor Iskrenkov Date: Sun, 15 Sep 2024 19:03:50 +0200 Subject: [PATCH] Update Minecraft to 1.21.1 --- .github/workflows/build-and-push.yml | 2 +- Dockerfile.spigot | 2 +- Dockerfile.vanilla | 2 +- docker-compose-production.yml | 2 +- docker-compose.yml | 2 +- minecraft/server.properties | 2 +- ruby/Gemfile | 2 +- ruby/configuration.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index a968482..9e28f8b 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -28,4 +28,4 @@ jobs: with: file: Dockerfile.spigot push: true - tags: ghcr.io/${{ github.repository_owner }}/hiwell:spigot-1.20.1 + tags: ghcr.io/${{ github.repository_owner }}/hiwell:spigot-1.21.1 diff --git a/Dockerfile.spigot b/Dockerfile.spigot index 72e0b79..8759753 100644 --- a/Dockerfile.spigot +++ b/Dockerfile.spigot @@ -1,4 +1,4 @@ -ARG MINECRAFT_VERSION=1.20.1 +ARG MINECRAFT_VERSION=1.21.1 # Step 1 - Download required resources FROM ruby:3.0.0-alpine AS downloads diff --git a/Dockerfile.vanilla b/Dockerfile.vanilla index a9d5f7d..53e5631 100644 --- a/Dockerfile.vanilla +++ b/Dockerfile.vanilla @@ -1,4 +1,4 @@ -ARG MINECRAFT_VERSION=1.20.1 +ARG MINECRAFT_VERSION=1.21.1 # Step 1 FROM ruby:3.0.0-alpine AS server-download diff --git a/docker-compose-production.yml b/docker-compose-production.yml index 5966c8a..9dae644 100644 --- a/docker-compose-production.yml +++ b/docker-compose-production.yml @@ -2,7 +2,7 @@ version: '3.9' services: hiwell: - image: ghcr.io/eiskrenkov/hiwell:spigot-1.20.1 + image: ghcr.io/eiskrenkov/hiwell:spigot-1.21.1 env_file: - .env ports: diff --git a/docker-compose.yml b/docker-compose.yml index d191803..89ab3c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.9' services: minecraft: - image: ghcr.io/eiskrenkov/hiwell:spigot-1.20.1 + image: ghcr.io/eiskrenkov/hiwell:spigot-1.21.1 platform: linux/x86_64 build: context: . diff --git a/minecraft/server.properties b/minecraft/server.properties index afb1b62..ba5ef73 100644 --- a/minecraft/server.properties +++ b/minecraft/server.properties @@ -8,7 +8,7 @@ enable-command-block=false enable-query=false generator-settings= level-name=world -motd=\u00A76\u00A7lHi\u00A7e\u00A7lWell \u00A7c\u00A7l1.20.1 +motd=\u00A76\u00A7lHi\u00A7e\u00A7lWell \u00A7c\u00A7l1.21.1 query.port=25565 pvp=true generate-structures=true diff --git a/ruby/Gemfile b/ruby/Gemfile index 82322fe..427ba80 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'faraday', '~> 1.4.0' gem 'faraday_middleware', '~> 1.0.0' -gem 'open_config', '~> 2.0.0' +gem 'open_config', '~> 2.1' gem 'pry', '~> 0.13.1' gem 'thor', '~> 1.1.0' gem 'net-scp', '~> 3.0.0' diff --git a/ruby/configuration.yml b/ruby/configuration.yml index bcf7a38..bfe4fb8 100644 --- a/ruby/configuration.yml +++ b/ruby/configuration.yml @@ -7,4 +7,4 @@ minecraft: spiget: api_host: https://api.spiget.org/v2 plugins: - skinsrestorer: '14.2.12' + skinsrestorer: '15.4.2'