From cd90dff605ec4bd178113e70e056e07496cfa5df Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 16 Dec 2023 17:37:10 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=201.18.2=E3=81=AEbase-image=E3=81=ABc?= =?UTF-8?q?hunk-search-rs=E3=82=92=E5=85=A5=E3=82=8C=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile index 7f0d5bcfb..6302bbf37 100644 --- a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile +++ b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile @@ -1,3 +1,4 @@ +FROM ghcr.io/giganticminecraft/chunk-search-rs:sha-74140b1 as chunk-search-provider FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:dbf60ddc2204edb92f49b363630056fb8f5eacfcf261cda29012cee43133fcd0 ENV VERSION="1.18.2" @@ -10,6 +11,8 @@ RUN /bin/bash -c "cat /extras/additional-plugin-list.ini >> /extras/plugin-list. # プラグインの設定ファイル COPY --link ./additional-plugin-configs /plugins +COPY --link --from=chunk-search-provider /build/chunk-search-rs /usr/bin/chunk-search-rs + ### # 環境変数として指定されるべきプラグインの設定 # From 9a7a3b83752f6171212320b39bc1a448240d7f0a Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 16 Dec 2023 17:40:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20seichi=5Fminecraft=5Fserver=5Fbase?= =?UTF-8?q?=E3=81=ABas=E3=82=92=E3=81=A4=E3=81=91=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile index 6302bbf37..154cb9587 100644 --- a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile +++ b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile @@ -1,5 +1,5 @@ FROM ghcr.io/giganticminecraft/chunk-search-rs:sha-74140b1 as chunk-search-provider -FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:dbf60ddc2204edb92f49b363630056fb8f5eacfcf261cda29012cee43133fcd0 +FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:dbf60ddc2204edb92f49b363630056fb8f5eacfcf261cda29012cee43133fcd0 as seichi_minecraft_server_base ENV VERSION="1.18.2" From 3bf798d2a67382ccda6cc5ec1d9e2516ca95b6ec Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 16 Dec 2023 17:42:07 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20copy=E3=81=ABfrom=E3=82=92=E3=81=A4?= =?UTF-8?q?=E3=81=91=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile index 154cb9587..791239c5d 100644 --- a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile +++ b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile @@ -5,11 +5,11 @@ ENV VERSION="1.18.2" # プラグインリスト # このイメージでは基底のリスト (/extras/plugin-list.ini) に追記する -COPY --link ./additional-plugin-list.ini /extras/additional-plugin-list.ini +COPY --link --from=seichi_minecraft_server_base ./additional-plugin-list.ini /extras/additional-plugin-list.ini RUN /bin/bash -c "cat /extras/additional-plugin-list.ini >> /extras/plugin-list.ini" # プラグインの設定ファイル -COPY --link ./additional-plugin-configs /plugins +COPY --link --from=seichi_minecraft_server_base ./additional-plugin-configs /plugins COPY --link --from=chunk-search-provider /build/chunk-search-rs /usr/bin/chunk-search-rs From b06eeafad8a558ce66a1bb85a1625493df41153b Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 16 Dec 2023 17:57:32 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20seichi=5Fminecraft=5Fserver=5Fbase?= =?UTF-8?q?=E3=81=AEas=E3=82=92=E6=B6=88=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile index 791239c5d..6302bbf37 100644 --- a/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile +++ b/docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile @@ -1,15 +1,15 @@ FROM ghcr.io/giganticminecraft/chunk-search-rs:sha-74140b1 as chunk-search-provider -FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:dbf60ddc2204edb92f49b363630056fb8f5eacfcf261cda29012cee43133fcd0 as seichi_minecraft_server_base +FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:dbf60ddc2204edb92f49b363630056fb8f5eacfcf261cda29012cee43133fcd0 ENV VERSION="1.18.2" # プラグインリスト # このイメージでは基底のリスト (/extras/plugin-list.ini) に追記する -COPY --link --from=seichi_minecraft_server_base ./additional-plugin-list.ini /extras/additional-plugin-list.ini +COPY --link ./additional-plugin-list.ini /extras/additional-plugin-list.ini RUN /bin/bash -c "cat /extras/additional-plugin-list.ini >> /extras/plugin-list.ini" # プラグインの設定ファイル -COPY --link --from=seichi_minecraft_server_base ./additional-plugin-configs /plugins +COPY --link ./additional-plugin-configs /plugins COPY --link --from=chunk-search-provider /build/chunk-search-rs /usr/bin/chunk-search-rs