From b11863d3b2445cd8162db33661ef06ac683533ac Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 10 Aug 2019 16:59:20 -0500 Subject: [PATCH] Delegate ToF buildtools inclusion to extending images (#331) --- Dockerfile | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64f4829a..5aa3cff3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,6 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf ARG RESTIFY_VER=1.1.6 ARG RCON_CLI_VER=1.4.6 ARG MC_SERVER_RUNNER_VER=1.3.2 -ARG TOF_BUILDTOOLS_VER=1.2.0 ARG ARCH=amd64 ADD https://github.com/itzg/restify/releases/download/${RESTIFY_VER}/restify_${RESTIFY_VER}_linux_${ARCH}.tar.gz /tmp/restify.tgz @@ -49,22 +48,6 @@ ADD https://github.com/itzg/mc-server-runner/releases/download/${MC_SERVER_RUNNE RUN tar -x -C /usr/local/bin -f /tmp/mc-server-runner.tgz mc-server-runner && \ rm /tmp/mc-server-runner.tgz -ADD https://git.faldoria.de/tof/server/build-tools/-/jobs/artifacts/buildtools-${TOF_BUILDTOOLS_VER}/raw/target/ToF-BuildTools.jar?job=release-artifact /tmp/tof-buildtools/BuildTools.jar - -ONBUILD ARG BUILDTOOLS_OUTPUT=/plugins -ONBUILD COPY *Dockerfile* *plugins.yml /tmp/tof-buildtools/ -ONBUILD RUN \ - [ -d /tmp/tof-buildtools ] && \ - [ $(find /tmp/tof-buildtools -type f -name plugins.yml | wc -l) -gt 0 ] && \ - java -jar /tmp/tof-buildtools/BuildTools.jar \ - --config "/tmp/tof-buildtools/plugins.yml" \ - --configs "plugins.yml" \ - --dir "/tmp/tof-buildtools/" \ - --output ${BUILDTOOLS_OUTPUT} && \ - chown -R minecraft:minecraft ${BUILDTOOLS_OUTPUT} && \ - rm -fR /tmp/tof-buildtools/ || \ - true - COPY mcadmin.jq /usr/share RUN chmod +x /usr/local/bin/*