Auto-merging via docker-versions-create

# Conflicts:
#	.github/workflows/build-multiarch.yml

Dockerfile

@@ -1,11 +1,10 @@
-FROM ubuntu:18.04
+FROM adoptopenjdk:latest
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
   apt-get install -y \
-    openjdk-8-jre-headless \
     imagemagick \
     gosu \
     curl wget \

start-deployPaper

@@ -4,17 +4,6 @@
 set -o pipefail
 isDebugging && set -x
 
-if [[ $PAPER_DOWNLOAD_URL ]]; then
-  export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
-
-  if [ -f "$SERVER" ]; then
-    zarg=(-z "$SERVER")
-  fi
-
-  echo "Preparing custom PaperMC jar from $PAPER_DOWNLOAD_URL"
-
-  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PAPER_DOWNLOAD_URL}"
-else
 # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
 
 build=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
@@ -64,7 +53,6 @@ else
   echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
   exit 1
 fi
-fi
 
 # Normalize on Spigot for downstream operations
 export TYPE=SPIGOT