Merge pull request #14 from Dwolla/updates

Update Java 11 and add support for additional LTS versions 17 and 21

Author: bpholt

.github/workflows/ci.yml

@@ -12,8 +12,13 @@ jobs:
     strategy:
       matrix:
         temurin_tag:
-          - 11.0.21_9-jre
-          - 11.0.21_9-jdk
+          - 11.0.27_6-jre
+          - 11.0.27_6-jdk
+          - 17.0.15_6-jre
+          - 17.0.15_6-jdk
+          - 21.0.7_6-jre
+          - 21.0.7_6-jdk
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -35,4 +40,4 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - run: echo "The build completed successfully"
+      - run: echo "The build completed successfully"

Dockerfile

@@ -2,10 +2,11 @@ ARG TEMURIN_TAG
 
 FROM eclipse-temurin:$TEMURIN_TAG
 
-MAINTAINER Dwolla Engineering <dev+docker@dwolla.com>
+LABEL maintainer="Dwolla Engineering <dev+docker@dwolla.com>"
 LABEL org.label-schema.vcs-url="https://github.com/Dwolla/docker-java"
 
-RUN if [ -f "$JAVA_HOME/jre/lib/security/java.security" ] ; then \
+RUN set -e; \
+    if [ -f "$JAVA_HOME/jre/lib/security/java.security" ] ; then \
         SECURITY_FILE_PATH=$JAVA_HOME/jre/lib/security/java.security ; \
     elif [ -f "$JAVA_HOME/lib/security/java.security" ] ; then \
         SECURITY_FILE_PATH=$JAVA_HOME/lib/security/java.security ; \
@@ -16,8 +17,10 @@ RUN if [ -f "$JAVA_HOME/jre/lib/security/java.security" ] ; then \
         exit 98 ; \
     fi && \
     apt-get update && \
-    apt-get install -y bash && \
-    apt-get install -y netcat && \
+    apt-get install -y \
+      bash \
+      netcat-traditional \
+    && \
     sed -i s_#networkaddress.cache.ttl=-1_networkaddress.cache.ttl=60_ $SECURITY_FILE_PATH && \
     sed -i s_securerandom.source=file:/dev/random_securerandom.source=file:/dev/./urandom_ $SECURITY_FILE_PATH && \
     apt-get clean && \

Makefile

@@ -1,4 +1,5 @@
-TEMURIN_TAGS := 8u322-b06-jdk 11.0.14.1_1-jdk 8u322-b06-jre 11.0.14.1_1-jre
+# this makefile requires yq be installed! brew install yq
+TEMURIN_TAGS := $(shell yq -r '.jobs.build.strategy.matrix.temurin_tag | .[]' .github/workflows/ci.yml | tr '\n' ' ')
 JOBS := $(addprefix temurin-,${TEMURIN_TAGS})
 CHECKS := $(addprefix check-,${TEMURIN_TAGS})
 CLEAN := $(addprefix clean-,${TEMURIN_TAGS})
@@ -18,4 +19,4 @@ ${CHECKS}: check-%:
 	grep --silent "^          - $*$$" .github/workflows/ci.yml
 
 ${CLEAN}: clean-%:
-	docker rmi dwolla/docker-java:$*-SNAPSHOT --force
+	docker rmi dwolla/docker-java:$*-SNAPSHOT --force