Polish Docker images

Author: acogoluegnes

Dockerfile-alpine

@@ -1,6 +1,6 @@
 FROM alpine:3.8 as builder
 
-ARG perf_test_version
+ARG perf_test_version="2.5.0"
 
 RUN set -eux; \
 	\
@@ -12,20 +12,23 @@ RUN set -eux; \
 
 # change the JAVA_URL variable below as well
 ENV JAVA_VERSION="11.0.2"
+# not to be found on Azul website, computed manually
+ENV JAVA_SHA256="eba6b1ee7302a7e509a9f28ed4fa2359e29431aed8dcc43b1145a8c8a3847791"
 
 RUN set -eux; \
     \
-    JAVA_URL="https://cdn.azul.com/zulu/bin/zulu11.29.3-ca-jdk11.0.2-linux_musl_x64.tar.gz"; \
+    JAVA_URL="https://cdn.azul.com/zulu/bin/zulu11.29.3-ca-jdk$JAVA_VERSION-linux_musl_x64.tar.gz"; \
     JAVA_PATH="/usr/lib/jdk-$JAVA_VERSION"; \
 	\
     wget --progress dot:giga --output-document "$JAVA_PATH.tar.gz" "$JAVA_URL"; \
+    echo "$JAVA_SHA256 *$JAVA_PATH.tar.gz" | sha256sum -c -; \
 	mkdir -p "$JAVA_PATH"; \
 	tar --extract --file "$JAVA_PATH.tar.gz" --directory "$JAVA_PATH" --strip-components 1; \
 	$JAVA_PATH/bin/jlink --compress=2 --output /jre --add-modules java.base,java.management,java.xml,java.naming,java.sql; \
 	/jre/bin/java -version
 
-# Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally
-ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
+# pgpkeys.uk is quite reliable, but allow for substitutions locally
+ARG PGP_KEYSERVER=pgpkeys.uk
 # If you are building this image locally and are getting `gpg: keyserver receive failed: No data` errors,
 # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.7 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.7/ubuntu
 # For context, see https://github.com/docker-library/official-images/issues/4252

Dockerfile-ubuntu

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04 as builder
 
-ARG perf_test_version
+ARG perf_test_version="2.5.0"
 
 RUN set -eux; \
 	\
@@ -27,8 +27,8 @@ RUN set -eux; \
 	$JAVA_PATH/bin/jlink --compress=2 --output /jre --add-modules java.base,java.management,java.xml,java.naming,java.sql; \
 	/jre/bin/java -version
 
-# Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally
-ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
+# pgpkeys.uk is quite reliable, but allow for substitutions locally
+ARG PGP_KEYSERVER=pgpkeys.uk
 # If you are building this image locally and are getting `gpg: keyserver receive failed: No data` errors,
 # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.7 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.7/ubuntu
 # For context, see https://github.com/docker-library/official-images/issues/4252