From 71a48ce10f240cc41f633fdb755b09e2304f0ef9 Mon Sep 17 00:00:00 2001 From: Marc Doughty Date: Sat, 31 Oct 2020 14:36:47 -0400 Subject: [PATCH 01/25] Convert to AdoptOpenJDK (#658) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f75b7b7c..bd144c55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM adoptopenjdk:latest LABEL org.opencontainers.image.authors="Geoff Bourne " From cb0add3b90b1babe588a76940e2fa3dbc42fd88f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 31 Oct 2020 13:38:44 -0500 Subject: [PATCH 02/25] Added github action match for multiarch-latest branch --- .github/workflows/build-multiarch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index bca773dd..4bd340e7 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -3,8 +3,10 @@ on: push: branches: - multiarch + - multiarch-latest tags: - "[0-9]+.[0-9]+.[0-9]+-multiarch" + - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" jobs: docker-buildx: From 72d7d4a65eb96a481f9b7dd11bd286f1067b206f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 31 Oct 2020 14:48:51 -0500 Subject: [PATCH 03/25] Switched to latest Docker buildx github action --- .github/workflows/build-multiarch.yml | 55 ++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 4bd340e7..e18d7c72 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -4,6 +4,7 @@ on: branches: - multiarch - multiarch-latest + - "test-multiarch-.*" tags: - "[0-9]+.[0-9]+.[0-9]+-multiarch" - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" @@ -14,14 +15,48 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2.2.0 - - name: Get branch name - uses: nelonoel/branch-name@v1 - - name: Docker Buildx - uses: ilteoood/docker_buildx@1.0.4 - with: - publish: true - imageName: itzg/minecraft-server - tag: ${{ env.BRANCH_NAME }} - dockerHubUser: ${{ secrets.DOCKER_USER }} - dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }} + - name: Prepare + id: prep + run: | + DOCKER_IMAGE=itzg/minecraft-server + VERSION=edge + if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION=${GITHUB_REF#refs/tags/v} + fi + if [[ $GITHUB_REF == refs/heads/* ]]; then + VERSION=${GITHUB_REF#refs/heads/} + if [[ $VERSION == master ]]; then + VERSION=latest + fi + fi + TAGS="${DOCKER_IMAGE}:${VERSION}" + echo ::set-output name=tags::${TAGS} + echo ::set-output name=cache_from::${TAGS} + + - name: Setup Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64,linux/arm/v7,linux/arm64 + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.prep.outputs.tags }} + cache-from: type=registry,ref=${{ steps.prep.outputs.cache_from }} + cache-to: type=inline + + - name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} From 4d878985d407999e6709cf94b61e40742ba53a06 Mon Sep 17 00:00:00 2001 From: Marc Doughty Date: Tue, 3 Nov 2020 07:33:19 -0500 Subject: [PATCH 04/25] Remove distro-provided JRE (#659) We don't need Java 8 from Ubuntu, we have 15 from AdoptOpenJDK. --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bd144c55..e904c81a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ LABEL org.opencontainers.image.authors="Geoff Bourne " RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive \ apt-get install -y \ - openjdk-8-jre-headless \ imagemagick \ gosu \ curl wget \ From a698248dff13de0140da0383bf9411c4ee9afc07 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Feb 2021 14:50:43 -0600 Subject: [PATCH 05/25] ci: Based on adoptopenjdk:15-jre --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a2a590fe..2a713e9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk:latest +FROM adoptopenjdk:15-jre LABEL org.opencontainers.image.authors="Geoff Bourne " From 21572d35471397d448ca2ed33c9572bbd5741050 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 27 Feb 2021 16:58:25 -0600 Subject: [PATCH 06/25] Ensure FTBA version.json is readable #784 --- start-deployFTBA | 3 +++ 1 file changed, 3 insertions(+) diff --git a/start-deployFTBA b/start-deployFTBA index 19800f9a..38fae975 100644 --- a/start-deployFTBA +++ b/start-deployFTBA @@ -43,6 +43,9 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker} writeEula + + # some modpacks result in --w----r-- permissions + chmod a+r version.json else log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go" fi From ebabfeb66930cd3545f40002db9047630015b297 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Mar 2021 16:05:01 -0600 Subject: [PATCH 07/25] Shifted PATH-fix earlier in startup --- start-configuration | 5 +++++ start-minecraftFinalSetup | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/start-configuration b/start-configuration index 12a2ef93..6b2be3eb 100644 --- a/start-configuration +++ b/start-configuration @@ -54,6 +54,11 @@ if [[ $RCON_PASSWORD_FILE ]]; then log "" fi +if ! which java > /dev/null; then + log "Fixing PATH to include java" + PATH="${PATH}:/opt/java/openjdk/bin" +fi + export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json case "X$VERSION" in diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index d630d3a9..3d0f7c75 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -167,11 +167,6 @@ function copyFilesForCurseForge() { cp -f /data/eula.txt "${FTB_DIR}/" } -if ! which java > /dev/null; then - log "Fixing PATH to include java" - PATH="${PATH}:/opt/java/openjdk/bin" -fi - mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s" if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then if isTrue ${DEBUG_EXEC}; then From 60a68963a8865bf01ec11c9bceac40a376c8e762 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 1 Apr 2021 16:27:50 -0500 Subject: [PATCH 08/25] Added git #819 --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5dd2f76a..92ca0d5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ sudo \ net-tools \ curl wget \ + git \ jq \ dos2unix \ mysql-client \ From a8c11c0cdb0a3a3315c45ee3234856f8174ca361 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Wed, 12 May 2021 11:32:40 -0500 Subject: [PATCH 09/25] Add java16 branch/image-tag #864 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 986bba2f..56c9ecdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk:15-jre +FROM adoptopenjdk:16-jre LABEL org.opencontainers.image.authors="Geoff Bourne " From 98c7e439277cc99729fdfc2e25fae24931324cb5 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Wed, 19 May 2021 20:47:48 -0500 Subject: [PATCH 10/25] ci: prefixed TOC commit message --- .github/workflows/generate-toc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-toc.yml b/.github/workflows/generate-toc.yml index 4a31c0b1..104e8f3f 100644 --- a/.github/workflows/generate-toc.yml +++ b/.github/workflows/generate-toc.yml @@ -17,4 +17,4 @@ jobs: ./gh-md-toc --insert --no-backup README.md - uses: stefanzweifel/git-auto-commit-action@v4.11.0 with: - commit_message: Auto update markdown TOC \ No newline at end of file + commit_message: "docs: Auto update markdown TOC" \ No newline at end of file From eb490e92c31c9015616982ebd666f3f6263692c6 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 06:50:04 -0500 Subject: [PATCH 11/25] ci: force rebuild of latest --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b9f2fb36..237b6a0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,5 +84,6 @@ RUN dos2unix /start* && chmod +x /start* RUN dos2unix /health.sh && chmod +x /health.sh RUN dos2unix /autopause/* && chmod +x /autopause/*.sh + ENTRYPOINT [ "/start" ] HEALTHCHECK --start-period=1m CMD /health.sh From ecafaf4ea1d7ae5b1e91c99437b25ab77fac2a79 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 06:51:17 -0500 Subject: [PATCH 12/25] ci: force rebuild of latest --- start-minecraftFinalSetup | 1 + 1 file changed, 1 insertion(+) diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index 75cfcf21..a6edf5c2 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -246,3 +246,4 @@ else exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}" fi fi + From 853a9884d741c22e4fc628e41b27e21c4dad0f6c Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 06:57:19 -0500 Subject: [PATCH 13/25] ci: force apk update --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 237b6a0c..5d12e2bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM adoptopenjdk/openjdk11:alpine-jre +ENV APK_UPDATE=20210521 + LABEL org.opencontainers.image.authors="Geoff Bourne " RUN apk add --no-cache -U \ From 5fc36516f4160543b52614daa4e11324a55dd7b1 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 07:39:59 -0500 Subject: [PATCH 14/25] ci: switch 'latest/master' build to multiarch --- .github/workflows/build-multiarch.yml | 2 ++ .github/workflows/main.yml | 2 -- Dockerfile | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index f6fc020f..9475222d 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -2,12 +2,14 @@ name: Build and publish multiarch on: push: branches: + - latest - multiarch - multiarch-latest - java15 - java16 - test/multiarch/* tags: + - "[0-9]+.[0-9]+.[0-9]+" - "[0-9]+.[0-9]+.[0-9]+-multiarch" - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" - "[0-9]+.[0-9]+.[0-9]+-java15" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d74d3e5..d402dcdc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,14 +3,12 @@ name: Build and Publish on: push: branches: - - master - java8 - openj9 - openj9-11 - adopt11 - test/* tags: - - "[0-9]+.[0-9]+.[0-9]+" - "[0-9]+.[0-9]+.[0-9]+-java8" - "[0-9]+.[0-9]+.[0-9]+-openj9" - "[0-9]+.[0-9]+.[0-9]+-openj9-11" diff --git a/Dockerfile b/Dockerfile index 669fd26f..c74276c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM adoptopenjdk:16-jre -ENV APK_UPDATE=20210521 - LABEL org.opencontainers.image.authors="Geoff Bourne " RUN apt-get update \ From 9c87f8749d52c1b6383132fb71fda1fad7e3f0b7 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 07:40:46 -0500 Subject: [PATCH 15/25] docs: updated README for latest=16 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 797590a5..a3bcfbd3 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ 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 | 11 | Alpine | Hotspot | amd64 | +| latest | 16 | Debian | Hotspot | amd64,arm64,armv7 | | java8 | 8 | Alpine | Hotspot | amd64 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | From 63412975c335a33a9139a0d487d78cca46bb5484 Mon Sep 17 00:00:00 2001 From: itzg Date: Fri, 21 May 2021 12:45:51 +0000 Subject: [PATCH 16/25] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3bcfbd3..c7f85038 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + From 317104de301835f960314c6bca162e189211a01f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 07:46:49 -0500 Subject: [PATCH 17/25] ci: fixed multiarch 'master' branch trigger --- .github/workflows/build-multiarch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 9475222d..3bfed034 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -2,7 +2,7 @@ name: Build and publish multiarch on: push: branches: - - latest + - master - multiarch - multiarch-latest - java15 From 78ec4ba2a7509ba22643c940dc2037f6f6588802 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 07:59:04 -0500 Subject: [PATCH 18/25] ci: multiarch build reference master branch --- .github/workflows/build-multiarch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 3bfed034..4204d591 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -35,6 +35,7 @@ jobs: tags: | type=ref,event=branch type=ref,event=tag + type=edge,branch=master - name: Setup Docker Buildx uses: docker/setup-buildx-action@v1 From cb17180dea271f8880b0b180ee8f576fe8de58e9 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 16:45:33 -0500 Subject: [PATCH 19/25] ci: updated build action for java16-openj9 #885 --- .github/workflows/build-multiarch.yml | 4 ++-- README.md | 2 +- docker-versions-create.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 4204d591..1e8406d8 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -6,14 +6,14 @@ on: - multiarch - multiarch-latest - java15 - - java16 + - java16* - test/multiarch/* tags: - "[0-9]+.[0-9]+.[0-9]+" - "[0-9]+.[0-9]+.[0-9]+-multiarch" - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" - "[0-9]+.[0-9]+.[0-9]+-java15" - - "[0-9]+.[0-9]+.[0-9]+-java16" + - "[0-9]+.[0-9]+.[0-9]+-java16*" paths-ignore: - "*.md" - "docs/**" diff --git a/README.md b/README.md index c7f85038..04bfa0b1 100644 --- a/README.md +++ b/README.md @@ -278,8 +278,8 @@ To use a different version of Java, please use a docker tag to run your Minecraf | java8 | 8 | Alpine | Hotspot | amd64 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | -| java15-openj9 | 15 | Debian | OpenJ9 | amd64,arm64 | | java16 | 16 | Debian | Hotspot | amd64,arm64,armv7 | +| java16-openj9 | 16 | Debian | OpenJ9 | amd64,arm64,armv7 | | adopt11 | 11 | Alpine | Hotspot | amd64 | | openj9 | 8 | Alpine | OpenJ9 | amd64 | | openj9-11 | 11 | Alpine | OpenJ9 | amd64 | diff --git a/docker-versions-create.sh b/docker-versions-create.sh index 54736a20..b006f6aa 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -8,8 +8,8 @@ branches_list=( 'openj9-11' 'adopt11' 'java15' - 'java15-openj9' 'java16' + 'java16-openj9' 'multiarch' 'multiarch-latest' ) From b806ea687152251ad7e34ae50e970afde90d1602 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 16:53:22 -0500 Subject: [PATCH 20/25] docs: adoptopenjdk:16-openj9 is only available on amd64 #885 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04bfa0b1..d084f23b 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | java16 | 16 | Debian | Hotspot | amd64,arm64,armv7 | -| java16-openj9 | 16 | Debian | OpenJ9 | amd64,arm64,armv7 | +| java16-openj9 | 16 | Debian | OpenJ9 | amd64 | | adopt11 | 11 | Alpine | Hotspot | amd64 | | openj9 | 8 | Alpine | OpenJ9 | amd64 | | openj9-11 | 11 | Alpine | OpenJ9 | amd64 | From e8f8d8b4d4caa478b0dcf255aef98143f2b22168 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 16:58:52 -0500 Subject: [PATCH 21/25] ci: introduced CACHE_NAME --- .github/workflows/build-multiarch.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 1e8406d8..128f4199 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -22,6 +22,8 @@ on: jobs: docker-buildx: runs-on: ubuntu-20.04 + env: + CACHE_NAME: master steps: - name: Checkout uses: actions/checkout@v2.3.4 @@ -44,9 +46,9 @@ jobs: uses: actions/cache@v2.1.5 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-${{ github.sha }} + key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}- + ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}- - name: Set up QEMU uses: docker/setup-qemu-action@v1.1.0 From 93cd299c77637d2045a3fd09f014c9d8c0a43321 Mon Sep 17 00:00:00 2001 From: itzg Date: Fri, 21 May 2021 21:59:13 +0000 Subject: [PATCH 22/25] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d084f23b..e4212b1e 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + From a5fe016854c2792be2eed52a59dd2e3d4fa03aab Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:00:50 -0500 Subject: [PATCH 23/25] docs: added edge tag to image versions section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e4212b1e..e626021b 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ 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 | 16 | Debian | Hotspot | amd64,arm64,armv7 | +| edge | 16 | Debian | Hotspot | amd64,arm64,armv7 | | java8 | 8 | Alpine | Hotspot | amd64 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | From 9bd6bc64b04d54d198f0fd9c1d5299cae76483c9 Mon Sep 17 00:00:00 2001 From: itzg Date: Fri, 21 May 2021 22:01:17 +0000 Subject: [PATCH 24/25] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e626021b..7ed0a083 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + From c9815e2ccb3fab890ea74266834e25032b6f6c40 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:04:11 -0500 Subject: [PATCH 25/25] ci: use CACHE_NAME in main.yml --- .github/workflows/build-multiarch.yml | 1 + .github/workflows/main.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 128f4199..56248782 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -49,6 +49,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}- + ${{ runner.os }}-buildx- - name: Set up QEMU uses: docker/setup-qemu-action@v1.1.0 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d402dcdc..00bc22bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,8 @@ jobs: needs: - test runs-on: ubuntu-20.04 + env: + CACHE_NAME: master steps: - uses: actions/checkout@v2.3.4 @@ -60,9 +62,9 @@ jobs: uses: actions/cache@v2.1.5 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }} + key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}- + ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}- ${{ runner.os }}-buildx- - name: Login to DockerHub