ci: Switched multiarch-java8 to be based on adoptopenjdk:8-jre-hotspot

This commit is contained in:
Geoff Bourne
2021-04-21 20:13:22 -05:00
parent 076038b470
commit 9fe1cb4a0d
2 changed files with 2 additions and 3 deletions
+1 -2
View File
@@ -1,11 +1,10 @@
FROM ubuntu:18.04 FROM adoptopenjdk:8-jre-hotspot
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 \
sudo \ sudo \
+1 -1
View File
@@ -56,7 +56,7 @@ fi
if ! which java > /dev/null; then if ! which java > /dev/null; then
log "Fixing PATH to include java" log "Fixing PATH to include java"
PATH="${PATH}:/usr/bin" PATH="${PATH}:/opt/java/openjdk/bin"
fi fi
export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json