Merge from master

Auto-merging via docker-versions-create
2026-02-17 15:13:55 +00:00 · 2021-05-22 13:46:46 -05:00 · 2021-05-21 23:03:19 -05:00 · 2021-05-21 22:52:21 -05:00 · 2021-05-21 17:36:21 -05:00 · 2021-05-21 17:32:38 -05:00
9 changed files with 20 additions and 26 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -7,6 +7,7 @@ on:
      - "multiarch*"
      - java8-openj9
      - java11*
+      - java15*
      - java16*
      - test/multiarch/*
    tags:
@@ -15,6 +16,7 @@ on:
      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
      - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
      - "[0-9]+.[0-9]+.[0-9]+-java11*"
+      - "[0-9]+.[0-9]+.[0-9]+-java15"
      - "[0-9]+.[0-9]+.[0-9]+-java16*"
    paths-ignore:
      - "*.md"
@@ -25,7 +27,7 @@ jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java15
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -47,7 +49,7 @@ jobs:
        uses: docker/setup-buildx-action@v1

      - name: Cache Docker layers
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.5
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
@@ -56,7 +58,7 @@ jobs:
            ${{ runner.os }}-buildx-

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v1.1.0

      - name: Login to DockerHub
        uses: docker/login-action@v1
@@ -66,10 +68,10 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v2.4.0
        with:
          context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
      - test
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java15

    steps:
    - uses: actions/checkout@v2.3.4
@@ -59,7 +59,7 @@ jobs:
      uses: docker/setup-buildx-action@v1

    - name: Cache Docker layers
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.5
      with:
        path: /tmp/.buildx-cache
        key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
@@ -75,7 +75,7 @@ jobs:

    - name: Build and push
      id: docker_build
-      uses: docker/build-push-action@v2.5.0
+      uses: docker/build-push-action@v2.4.0
      with:
        context: .
        file: ./Dockerfile
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-openj9
+FROM adoptopenjdk:15-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

--- a/README.md
+++ b/README.md
@@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Enabling Autopause](#enabling-autopause)
   * [Running on RaspberryPi](#running-on-raspberrypi)

-<!-- Added by: runner, at: Sun May 23 17:29:02 UTC 2021 -->
+<!-- Added by: runner, at: Sat May 22 13:59:04 UTC 2021 -->

 <!--te-->

@@ -275,11 +275,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         | 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 |
 | java8-openj9   | 8            | Debian | OpenJ9   | amd64             |
 | java11         | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
+| java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -7,6 +7,7 @@ branches_list=(
  'java8-openj9'
  'java11'
  'java11-openj9'
+  'java15'
  'java16'
  'java16-openj9'
  'multiarch-latest'
--- a/examples/modpacks/README.md
+++ b/examples/modpacks/README.md
@@ -1,3 +1,3 @@
 Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.

-The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/3012800>.
+The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.
--- a/7
+++ b/7
@@ -85,14 +85,13 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
      fi

      log "Installing forge server"
-      dirOfInstaller=$(dirname "${forgeInstallerJar}")
-      (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer)
+      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer)
    fi

    echo "${FTB_SERVER_MOD}" > $installMarker
  fi

-  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
+  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
  if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
    log "ERROR unable to locate installed forge server jar"
    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
@@ -185,7 +184,7 @@ if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then

    # Allow up to 2 levels since some modpacks have a top-level directory named
    # for the modpack
-    forgeJar=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
+    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
    if [[ "$forgeJar" ]]; then
      export FTB_BASE_DIR=$(dirname "${forgeJar}")
      log "No entry script found, so building one for ${forgeJar}"
--- a/2
+++ b/2
@@ -68,7 +68,7 @@ if [ ! -e $installMarker ]; then
          log "Unable to compute URL for $normForgeVersion"
          exit 2
        fi
-        downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
+        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
        log "...trying $downloadUrl"
        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
          break
--- a/10
+++ b/10
@@ -212,11 +212,6 @@ EOF
    "${FTB_SERVER_START}"
  )

-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: ${finalArgs[@]}"
-    exit
-  fi
-
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
@@ -241,11 +236,6 @@ else
    "$@" $EXTRA_ARGS
  )

-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: java ${finalArgs[@]}"
-    exit
-  fi
-
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
Author	SHA1	Message	Date
Geoff Bourne	68ccc1c36d	Merge from master	2021-05-22 13:46:46 -05:00
Geoff Bourne	3aa3e77c27	Auto-merging via docker-versions-create	2021-05-21 23:03:19 -05:00
Geoff Bourne	5d162d6c19	Auto-merging via docker-versions-create	2021-05-21 22:52:21 -05:00
Geoff Bourne	cf6829001e	ci: introduced CACHE_NAME	2021-05-21 17:36:21 -05:00
Geoff Bourne	af77b29509	ci: add java11 to build/merge	2021-05-21 17:32:38 -05:00
Geoff Bourne	521099b733	Auto-merging via docker-versions-create	2021-05-19 20:30:03 -05:00
Geoff Bourne	f297654bb6	Auto-merging via docker-versions-create	2021-05-15 12:43:07 -05:00
Geoff Bourne	01bd8f5860	Merge branch 'multiarch' into java15 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:01:56 -05:00