From 96aa1054dc3d620688f7082a8887a6b10967d931 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 30 Jan 2021 16:16:36 -0600 Subject: [PATCH 1/2] Upgraded mainline/latest to Java 11 --- Dockerfile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c21bbd0a..9cf2b045 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8u212-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL org.opencontainers.image.authors="Geoff Bourne " diff --git a/README.md b/README.md index 98f4b301..1e87023c 100644 --- a/README.md +++ b/README.md @@ -162,13 +162,13 @@ To use a different version of Java, please use a docker tag to run your Minecraf | Tag name | Java version | Linux | JVM Type | Architecture | | -------------- | -------------|--------|----------|-------------------| -| latest | 8 | Alpine | Hotspot | amd64 | +| latest | 11 | Alpine | Hotspot | amd64 | | java8 | 8 | Alpine | Hotspot | amd64 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | adopt11 | 11 | Alpine | Hotspot | amd64 | | openj9 | 8 | Alpine | OpenJ9 | amd64 | | openj9-11 | 11 | Alpine | OpenJ9 | amd64 | -| multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | +| multiarch | 11 | Debian | Hotspot | amd64,arm64,armv7 | | multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 | For example, to use Java version 15 on any supported architecture: From beeaf1a9962dbbe0c15b527640e18534875708cf Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Feb 2021 15:48:27 -0600 Subject: [PATCH 2/2] ci: Added java8-multiarch to build and docs --- .github/workflows/build-multiarch.yml | 1 + README.md | 3 ++- docker-versions-create.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index d8eb6e5c..a0ec4aa8 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -3,6 +3,7 @@ on: push: branches: - multiarch + - java8-multiarch - multiarch-latest - java15 - test/multiarch/* diff --git a/README.md b/README.md index 1e87023c..0f0007af 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf | -------------- | -------------|--------|----------|-------------------| | latest | 11 | Alpine | Hotspot | amd64 | | java8 | 8 | Alpine | Hotspot | amd64 | +| java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | adopt11 | 11 | Alpine | Hotspot | amd64 | | openj9 | 8 | Alpine | OpenJ9 | amd64 | @@ -514,7 +515,7 @@ A [Catserver](http://catserver.moe/) type server can be used with ## Running a server with a Feed the Beast modpack -> **NOTE** requires `itzg/minecraft-server:multiarch` image +> **NOTE** requires one of the Debian based images listed in [the Java versions section](#running-minecraft-server-on-different-java-version). [Feed the Beast application](https://www.feed-the-beast.com/) modpacks are supported by using `-e TYPE=FTBA` (**note** the "A" at the end of the type). This server type will automatically take care of downloading and installing the modpack and appropriate version of Forge, so the `VERSION` does not need to be specified. diff --git a/docker-versions-create.sh b/docker-versions-create.sh index f05e2557..93c4a9d6 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -1,7 +1,7 @@ #!/bin/bash #set -x # Use this variable to indicate a list of branches that docker hub is watching -branches_list=('openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' 'multiarch-latest') +branches_list=('java8' 'java8-multiarch' 'openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' 'multiarch-latest') function TrapExit { echo "Checking out back in master"