From a9b8cc49c7b193575526d0b0a997f860428c4773 Mon Sep 17 00:00:00 2001 From: outductor Date: Wed, 20 Dec 2023 23:01:39 +0900 Subject: [PATCH] modify dockerfile --- docker/spigot/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/spigot/Dockerfile b/docker/spigot/Dockerfile index 75c5ec6d5d..74e7abacb3 100644 --- a/docker/spigot/Dockerfile +++ b/docker/spigot/Dockerfile @@ -1,18 +1,17 @@ # syntax=docker/dockerfile:1.6 FROM ghcr.io/giganticminecraft/chunk-search-rs:sha-f1943b1 as chunk-search-provider -FROM ghcr.io/giganticminecraft/seichiassist-runner-v2:3731293 +FROM ghcr.io/giganticminecraft/seichiassist-runner-v2:486225f FROM itzg/minecraft-server:java17-jdk # nkfをインストール RUN apt-get update && apt-get install -y nkf \ -&& apt-get clean \ -&& rm -rf /var/lib/apt/lists/* + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* #yqをインストール -RUN curl -LJO https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && \ -mv yq_linux_amd64 /usr/local/bin/yq && \ -chmod a+x /usr/local/bin/yq +FROM mikefarah/yq:4.40.5 as yq +COPY --from=yq /usr/bin/yq /usr/bin/yq # chunk-search-rsをインストール COPY --link --from=chunk-search-provider /build/chunk-search-rs /usr/bin/chunk-search-rs