Merge pull request #238 from infosiftr/eclipse-temurin

Switch to Eclipse Temurin

Author: tianon

2.2/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:{{ .java }}-jre-hotspot-focal
+FROM eclipse-temurin:{{ .java }}-jre-focal
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -63,7 +63,7 @@ ENV CASSANDRA_CONF /etc/cassandra
 ENV PATH $CASSANDRA_HOME/bin:$PATH
 
 # https://cwiki.apache.org/confluence/display/CASSANDRA2/DebianPackaging#DebianPackaging-AddingRepositoryKeys
-# $ docker run --rm buildpack-deps:buster-curl bash -c 'wget -qO- https://downloads.apache.org/cassandra/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t" fpr " \\"; pub = 0 }'
+# $ docker run --rm buildpack-deps:bullseye-curl bash -c 'wget -qO- https://downloads.apache.org/cassandra/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t" fpr " \\"; pub = 0 }'
 ENV GPG_KEYS \
 # Eric Evans <[email protected]>
 	CEC86BB4A0BA9D0F90397CAEF8358FA2F2833C93 \
@@ -84,7 +84,9 @@ ENV GPG_KEYS \
 # Brandon Williams <[email protected]>
 	B7842CDAF36E6A3214FAE35D5E85B9AE0B84C041 \
 # Ekaterina Buryanova Dimitrova (CODE SIGNING KEY) <[email protected]>
-	3E9C876907A560ACA00964F363E9BAD215BBF5F0
+	3E9C876907A560ACA00964F363E9BAD215BBF5F0 \
+# Sam Tunnicliffe (CODE SIGNING KEY) <[email protected]>
+	F8B7FD00E05C932991A2CD6150EE103D162C5A55
 
 ENV CASSANDRA_VERSION {{ .version }}
 ENV CASSANDRA_SHA512 {{ .sha512 }}