Run build in container - but still cache (fixes #374)

Author: vorburger

.dockerignore

@@ -1,36 +1,5 @@
-# No need for the Dockerfile itself, this makes it much faster to make small changes in it
-Dockerfile
+# https://github.com/containers/common/blob/main/docs/containerignore.5.md
 
-# No need to push big ./.git/ into container, it's not required to build
-.git
-
-
-# Keep this in sync with .gitignore:
-
-.settings/
-.project
-.classpath
-
-bin/
-.apt_generated/
-xtend-gen/
-.rpt2_cache/
-.gradle/
-build/
-out/
-.gradletasknamecache
-/.nb-gradle/
-dist/
-
-.idea/
-*.iml
-
-node_modules/
-coverage/
-*d.ts
-
-web/.vertx/file-cache-*
-
-.vscode/
-.history/
-.vertx/
+# Nothing to ignore, since our
+# Dockerfile-build does not actually COPY anything, and
+# Dockerfile only COPY specifically what it needs.

Dockerfile

@@ -1,17 +1,8 @@
-FROM openjdk:11-jdk as build
-
-# https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
-RUN curl -fsSL https://deb.nodesource.com/setup_17.x | bash - && apt install -y nodejs && node --version
-
-RUN mkdir /mods/ && cd /mods/ && curl -sS -L -J -f -O https://github.com/OASIS-learn-study/swissarmyknife-minecraft-server-binaries/raw/master/LuckPerms-Sponge-5.3.98.jar
+FROM itzg/minecraft-server:java8-multiarch
 
-COPY . /project
-WORKDIR /project
-RUN ./gradlew build -PexcludeTests="**/SeleniumTest*"
+# RUN mkdir /mods/ && cd /mods/ && curl -sS -L -J -f -O https://github.com/OASIS-learn-study/swissarmyknife-minecraft-server-binaries/raw/master/LuckPerms-Sponge-5.3.98.jar
 
-# Keep any changes made here strictly in sync with Dockerfile-local
-FROM itzg/minecraft-server:java8-multiarch
-COPY --from=build /project/web/build/libs/*-all.jar /mods/
+COPY web/build/libs/*-all.jar /mods/
 COPY minecraft-server/* /data-init/
 
 ENV EULA=TRUE

Dockerfile-build

@@ -0,0 +1,6 @@
+FROM openjdk:11-jdk as build
+
+# https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
+RUN curl -fsSL https://deb.nodesource.com/setup_17.x | bash - && apt install -y nodejs && node --version
+
+WORKDIR /project

Dockerfile-local

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euox pipefail
+
+podman build -f Dockerfile-build -t minecraft-storeys-maker-build .
+podman run --rm -v $PWD:/project:Z -v $HOME/.gradle:/root/.gradle:Z minecraft-storeys-maker-build ./gradlew --no-daemon build -PexcludeTests="**/SeleniumTest*"
+
+# NB --format=docker because the "oci" default looses the mc-health HEALTHCHECK of the parent image
+podman build -f Dockerfile --format=docker -t minecraft-storeys-maker .

make

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 set -euox pipefail
 
-# https://github.com/OASIS-learn-study/minecraft-storeys-maker#build-it
-# NB --format=docker because the "oci" default looses the mc-health HEALTHCHECK of the parent image
-./gradlew build
-podman build -f Dockerfile-local --format=docker -t minecraft-storeys-maker .
+./make
 
 podman stop --time 7 storeys || true