From eff000c42805294f94b33d87ff18e5c530f075d0 Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Thu, 9 Nov 2023 23:37:09 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=201.18.2=E3=81=AE=E3=83=99=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E6=99=82=E3=81=ABmod-downloader=E3=82=92=E5=AE=9F?= =?UTF-8?q?=E8=A1=8C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?= =?UTF-8?q?=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 | 5 +++++ 1 file changed, 5 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 803fb51c6..38f817c5c 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,5 @@ +FROM ghcr.io/giganticminecraft/mod-downloader:sha-39a89de as mod-downloader + FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:57accce4686dfe6bf6cb5107a664b169f130e97ef697ea7b37778a14e7f942e6 ENV VERSION="1.18.2" @@ -7,6 +9,9 @@ ENV VERSION="1.18.2" 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 --from=mod-downloader ./bin/ / +RUN /mod-downloader + # プラグインの設定ファイル COPY --link ./additional-plugin-configs /plugins From 205cd8a8aa75cde26229500863fe60670328d993 Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Thu, 9 Nov 2023 23:43:49 +0900 Subject: [PATCH 2/6] =?UTF-8?q?ci:=20=E3=83=99=E3=83=BC=E3=82=B9=E3=82=A4?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=B8=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?CI=E3=81=AB=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_mcserver_base_images.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_mcserver_base_images.yaml b/.github/workflows/build_mcserver_base_images.yaml index e18b05d35..ed7772167 100644 --- a/.github/workflows/build_mcserver_base_images.yaml +++ b/.github/workflows/build_mcserver_base_images.yaml @@ -1,5 +1,5 @@ name: Build Minecraft Server Base Images -on: +on: push: paths: - ".github/workflows/build_mcserver_base_images.yaml" @@ -78,3 +78,9 @@ jobs: cache-to: type=gha,mode=max build-args: | MCSERVER_BASE_IMAGE=itzg/minecraft-server:${{ matrix.mcserver_base_image_tag }}@${{ matrix.mcserver_base_image_digest }} + MINIO_ENDPOINT=seichi-private-plugin-blackhole-minio-console.minio:9001 + MINIO_ACCESS_KEY= ${{ secrets.TF_VAR_MINIO_PROD_ACCESS_KEY }} + MINIO_ACCESS_SECRET=${{ secrets.TF_VAR_MINIO_PROD_ACCESS_SECRET }} + BUCKET_NAME=seichi-plugins + BUCKET_PREFIX_NAME=deb-1-18-2 + DOWNLOAD_TARGET_DIR_PATH=/plugins From f647891f9b2bebaffbdfa6104e2b7cd29d68a4d9 Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Thu, 9 Nov 2023 23:51:27 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20Dockerfile=E3=81=ABARG=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 7 +++++++ 1 file changed, 7 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 38f817c5c..6bcf9d012 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 @@ -2,6 +2,13 @@ FROM ghcr.io/giganticminecraft/mod-downloader:sha-39a89de as mod-downloader FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:57accce4686dfe6bf6cb5107a664b169f130e97ef697ea7b37778a14e7f942e6 +ARG MINIO_ENDPOINT +ARG MINIO_ACCESS_KEY +ARG MINIO_ACCESS_SECRET +ARG BUCKET_NAME +ARG BUCKET_PREFIX_NAME +ARG DOWNLOAD_TARGET_DIR_PATH + ENV VERSION="1.18.2" # プラグインリスト From 08f9a223313c66d74a4b8cd6c37b5d578d0740fe Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:34:47 +0900 Subject: [PATCH 4/6] =?UTF-8?q?ci:=20build=5Fmc=5Fserver=5Fimages=E3=81=A7?= =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0=E3=82=92=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_mcserver_images.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_mcserver_images.yaml b/.github/workflows/build_mcserver_images.yaml index d6f71833a..025b5dac2 100644 --- a/.github/workflows/build_mcserver_images.yaml +++ b/.github/workflows/build_mcserver_images.yaml @@ -1,5 +1,5 @@ name: Build Minecraft Server Images -on: +on: push: paths: - ".github/workflows/build_mcserver_images.yaml" @@ -93,3 +93,10 @@ jobs: cache-from: type=gha # すべてのビルドステージのすべてのレイヤーをキャッシュして欲しいのでmode=max cache-to: type=gha,mode=max + build-args: | + MINIO_ENDPOINT=seichi-private-plugin-blackhole-minio-console.minio:9001 + MINIO_ACCESS_KEY= ${{ secrets.TF_VAR_MINIO_PROD_ACCESS_KEY }} + MINIO_ACCESS_SECRET=${{ secrets.TF_VAR_MINIO_PROD_ACCESS_SECRET }} + BUCKET_NAME=seichi-plugins + BUCKET_PREFIX_NAME=deb-1-18-2 + DOWNLOAD_TARGET_DIR_PATH=/plugins From e2b4fbb778378828a029877af09708477cc52143 Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:39:30 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"fix:=20Dockerfile=E3=81=ABARG?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f647891f9b2bebaffbdfa6104e2b7cd29d68a4d9. --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 7 ------- 1 file changed, 7 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 6bcf9d012..38f817c5c 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 @@ -2,13 +2,6 @@ FROM ghcr.io/giganticminecraft/mod-downloader:sha-39a89de as mod-downloader FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:57accce4686dfe6bf6cb5107a664b169f130e97ef697ea7b37778a14e7f942e6 -ARG MINIO_ENDPOINT -ARG MINIO_ACCESS_KEY -ARG MINIO_ACCESS_SECRET -ARG BUCKET_NAME -ARG BUCKET_PREFIX_NAME -ARG DOWNLOAD_TARGET_DIR_PATH - ENV VERSION="1.18.2" # プラグインリスト From 985e08188733c03716e41e0e138540131a9f0c8a Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:41:05 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Revert=20"Revert=20"fix:=20Dockerfile?= =?UTF-8?q?=E3=81=ABARG=E3=82=92=E8=BF=BD=E5=8A=A0""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e2b4fbb778378828a029877af09708477cc52143. --- .../debug/seichi-servers/base-images/1_18_2/Dockerfile | 7 +++++++ 1 file changed, 7 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 38f817c5c..6bcf9d012 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 @@ -2,6 +2,13 @@ FROM ghcr.io/giganticminecraft/mod-downloader:sha-39a89de as mod-downloader FROM ghcr.io/giganticminecraft/seichi_minecraft_server_base:1.0.0-java17-jdk@sha256:57accce4686dfe6bf6cb5107a664b169f130e97ef697ea7b37778a14e7f942e6 +ARG MINIO_ENDPOINT +ARG MINIO_ACCESS_KEY +ARG MINIO_ACCESS_SECRET +ARG BUCKET_NAME +ARG BUCKET_PREFIX_NAME +ARG DOWNLOAD_TARGET_DIR_PATH + ENV VERSION="1.18.2" # プラグインリスト