Merge latest from master

Dockerfile

@@ -1,6 +1,5 @@
-FROM openjdk:8-jdk-alpine
-
-LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
+ARG BASE_IMAGE=openjdk:8-jdk-alpine
+FROM ${BASE_IMAGE}
 
 RUN apk add --no-cache -U \
     openssl \
@@ -62,7 +61,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.16.0
+ARG MC_HELPER_VERSION=1.16.2
 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}
 RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
   | tar -C /usr/share -zxf - \