Compare commits

..
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -1,10 +1,11 @@
FROM adoptopenjdk:latest FROM ubuntu:18.04
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>" LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
RUN apt-get update \ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \ && DEBIAN_FRONTEND=noninteractive \
apt-get install -y \ apt-get install -y \
openjdk-8-jre-headless \
imagemagick \ imagemagick \
gosu \ gosu \
curl wget \ curl wget \
+2 -2
View File
@@ -48,8 +48,8 @@ else
fi fi
isDebugging && cat version.json isDebugging && cat version.json
forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json) forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json)
mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json) mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
variants=( variants=(
forge-${mcVersion}-${forgeVersion}.jar forge-${mcVersion}-${forgeVersion}.jar