Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.18.2のベースイメージをビルドするときにmod-downloaderを利用してプラグインをダウンロードするように #1397

Closed
wants to merge 6 commits into from
Closed

1.18.2のベースイメージをビルドするときにmod-downloaderを利用してプラグインをダウンロードするように #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eff000c
feat: 1.18.2のベースイメージビルド時にmod-downloaderを実行するようにする
rito528 Nov 9, 2023
205cd8a
ci: ベースイメージのビルドCIに環境変数を追加
rito528 Nov 9, 2023
f647891
fix: DockerfileにARGを追加
rito528 Nov 9, 2023
08f9a22
ci: build_mc_server_imagesで環境変数を指定する
rito528 Nov 9, 2023
e2b4fbb
Revert "fix: DockerfileにARGを追加"
rito528 Nov 9, 2023
985e081
Revert "Revert "fix: DockerfileにARGを追加""
rito528 Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build_mcserver_base_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build Minecraft Server Base Images
on:
on:
push:
paths:
- ".github/workflows/build_mcserver_base_images.yaml"
Expand Down Expand Up @@ -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
9 changes: 8 additions & 1 deletion .github/workflows/build_mcserver_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build Minecraft Server Images
on:
on:
push:
paths:
- ".github/workflows/build_mcserver_images.yaml"
Expand Down Expand Up @@ -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
12 changes: 12 additions & 0 deletions docker-images/mcservers/debug/seichi-servers/base-images/1_18_2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
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"

# プラグインリスト
# このイメージでは基底のリスト (/extras/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 --from=mod-downloader ./bin/ /
RUN /mod-downloader

# プラグインの設定ファイル
COPY --link ./additional-plugin-configs /plugins

Expand Down