From 5373065e0a4401ffc1a3a9b1ee6915ba77f69b24 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Thu, 14 Jul 2022 11:56:19 +0900 Subject: [PATCH 1/8] test 1 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b90495c6bcf..3e88f84a1bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ # syntax = docker/dockerfile:1.3 -ARG BASE_IMAGE=eclipse-temurin:17-jre-focal -FROM ${BASE_IMAGE} +FROM ghcr.io/graalvm/graalvm-ce:ol8-java17 # CI system should set this to a hash or git revision of the build directory and it's contents to # ensure consistent cache updates. From ef43e948f93205ad0064469afdeab726efd73cdc Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Fri, 15 Jul 2022 10:20:44 +0900 Subject: [PATCH 2/8] Working image --- build/ol/install-packages.sh | 37 ++++++++++++++++++++++++++++++++++++ build/ol/setup-user.sh | 2 ++ scripts/start-utils | 5 +++++ 3 files changed, 44 insertions(+) create mode 100755 build/ol/install-packages.sh create mode 100755 build/ol/setup-user.sh diff --git a/build/ol/install-packages.sh b/build/ol/install-packages.sh new file mode 100755 index 00000000000..6a563bbc032 --- /dev/null +++ b/build/ol/install-packages.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +set -e + +microdnf install dnf -y + +dnf install 'dnf-command(config-manager)' -y +dnf config-manager --set-enabled ol8_codeready_builder +tee /etc/yum.repos.d/ol8-epel.repo< /dev/null; then return 0 + elif [ "${distro}" == "ol" ] && sha256sum -c "${sum_file}" --status 2> /dev/null; then + return 0 + else + return 1 + fi else return 1 fi From 18b5420a0171234b788a25c077f8d1b55c70bdd8 Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Fri, 15 Jul 2022 10:25:56 +0900 Subject: [PATCH 3/8] revert Dockerfile to original --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e88f84a1bb..b90495c6bcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ # syntax = docker/dockerfile:1.3 -FROM ghcr.io/graalvm/graalvm-ce:ol8-java17 +ARG BASE_IMAGE=eclipse-temurin:17-jre-focal +FROM ${BASE_IMAGE} # CI system should set this to a hash or git revision of the build directory and it's contents to # ensure consistent cache updates. From 80d3f3f8a95de8da9d34d6e2976dea74f81115e0 Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Fri, 15 Jul 2022 10:36:24 +0900 Subject: [PATCH 4/8] build GraalVM --- .github/workflows/build-multiarch.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 5b7b8700f02..d99119084f1 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -18,10 +18,12 @@ jobs: matrix: variant: - java17 + - java17-graalvm-ce - java17-jdk - java17-openj9 - java17-alpine - java8 + - java8-graalvm-ce - java8-multiarch - java8-openj9 - java8-jdk @@ -35,6 +37,10 @@ jobs: baseImage: eclipse-temurin:17-jre-focal platforms: linux/amd64,linux/arm/v7,linux/arm64 mcVersion: 1.18.2 + - variant: java17-graalvm-ce + baseImage: ghcr.io/graalvm/graalvm-ce:ol8-java17 + platforms: linux/amd64,linux/arm64 + mcVersion: 1.18.2 - variant: java17-jdk baseImage: eclipse-temurin:17-focal platforms: linux/amd64,linux/arm/v7,linux/arm64 @@ -65,6 +71,10 @@ jobs: baseImage: openjdk:8-jre-alpine3.9 platforms: linux/amd64 mcVersion: 1.12.2 + - variant: java8-graalvm-ce + baseImage: ghcr.io/graalvm/graalvm-ce:java8 + platforms: linux/amd64 + mcVersion: 1.12.2 - variant: java8-multiarch baseImage: eclipse-temurin:8u312-b07-jre-focal platforms: linux/amd64,linux/arm64 From 2815746f4558a759d4e91d03823f73982c69b12b Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Fri, 15 Jul 2022 10:38:42 +0900 Subject: [PATCH 5/8] forgot to add file --- build/ol/install-gosu.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 build/ol/install-gosu.sh diff --git a/build/ol/install-gosu.sh b/build/ol/install-gosu.sh new file mode 100755 index 00000000000..9a7a4d04c5d --- /dev/null +++ b/build/ol/install-gosu.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +[[ $(uname -m) == "aarch64" ]] && curl -sL -o /bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-arm64 && chmod +x /bin/gosu +[[ $(uname -m) == "x86_64" ]] && curl -sL -o /bin/gosu https://github.com/tianon/gosu/releases/download/1.14/gosu-amd64 && chmod +x /bin/gosu + From 32694dc0bab18fb0bba9bfec2958d975bd2e2e50 Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Fri, 15 Jul 2022 10:40:27 +0900 Subject: [PATCH 6/8] fix typo in start-utils --- scripts/start-utils | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/start-utils b/scripts/start-utils index 810d7ff1b2b..df813e68e21 100755 --- a/scripts/start-utils +++ b/scripts/start-utils @@ -293,7 +293,4 @@ function checkSum() { else return 1 fi - else - return 1 - fi } From 18db872291bacadb21b67c3a51e91839d6a8f5c1 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Fri, 15 Jul 2022 13:55:36 +0900 Subject: [PATCH 7/8] typo fix --- scripts/start-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start-utils b/scripts/start-utils index df813e68e21..8e93d75384d 100755 --- a/scripts/start-utils +++ b/scripts/start-utils @@ -288,7 +288,7 @@ function checkSum() { return 0 elif [ "${distro}" == "alpine" ] && sha1sum -c "${sum_file}" -s 2> /dev/null; then return 0 - elif [ "${distro}" == "ol" ] && sha256sum -c "${sum_file}" --status 2> /dev/null; then + elif [ "${distro}" == "ol" ] && sha1sum -c "${sum_file}" --status 2> /dev/null; then return 0 else return 1 From 194bf9b7a78421f12581ce304c5d7156009d636b Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Sat, 16 Jul 2022 23:54:24 +0900 Subject: [PATCH 8/8] Added GraalVM to README --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 634ae045837..286aeb6b2e6 100644 --- a/README.md +++ b/README.md @@ -168,16 +168,18 @@ the server jar remain in the `/data` directory. It is safe to remove those._ When using the image `itzg:/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container. | Tag name | Java version | Linux | JVM Type | Architecture | -|-----------------|-------------|--------|----------|-------------------| -| latest | 17 | Debian | Hotspot | amd64,arm64,armv7 | -| java8 | 8 | Alpine | Hotspot | amd64 | -| java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | -| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | -| java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 | -| java11-openj9 | 11 | Debian | OpenJ9 | amd64 | -| java17 | 17 | Ubuntu | Hotspot | amd64,arm64,armv7 | -| java17-openj9 | 17 | Debian | OpenJ9 | amd64 | -| java17-alpine | 17 | Alpine | Hotspot | amd64 | +|-------------------|-------------|--------|------------|-------------------| +| latest | 17 | Debian | Hotspot | amd64,arm64,armv7 | +| java8 | 8 | Alpine | Hotspot | amd64 | +| java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | +| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | +| java8-graalvm-ce | 8 | Oracle | GraalVM CE | amd64 | +| java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 | +| java11-openj9 | 11 | Debian | OpenJ9 | amd64 | +| java17 | 17 | Ubuntu | Hotspot | amd64,arm64,armv7 | +| java17-openj9 | 17 | Debian | OpenJ9 | amd64 | +| java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 | +| java17-alpine | 17 | Alpine | Hotspot | amd64 | For example, to use Java version 8 on any supported architecture: