Skip to content

Commit

Permalink
Add fonts (& infrastructure) to Alpine images
Browse files Browse the repository at this point in the history
This fixes #112 & #108
  • Loading branch information
TobiX committed Oct 29, 2024
1 parent 043a4ed commit a3c972f
Show file tree
Hide file tree
Showing 27 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-11=$version-r0 && \
apk add --no-cache amazon-corretto-11=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-11=$version-r0 && \
apk add --no-cache amazon-corretto-11=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-11=$version-r0 && \
apk add --no-cache amazon-corretto-11=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-11=$version-r0 && \
apk add --no-cache amazon-corretto-11=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-17=$version-r0 && \
apk add --no-cache amazon-corretto-17=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-17=$version-r0 && \
apk add --no-cache amazon-corretto-17=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-17=$version-r0 && \
apk add --no-cache amazon-corretto-17=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-17=$version-r0 && \
apk add --no-cache amazon-corretto-17=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 17/slim/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-17=$version-r0 binutils && \
apk add --no-cache amazon-corretto-17=$version-r0 binutils font-droid && \
/usr/lib/jvm/default-jvm/bin/jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim && \
apk del binutils amazon-corretto-17 && \
mkdir -p /usr/lib/jvm/ && \
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-21=$version-r0 && \
apk add --no-cache amazon-corretto-21=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-21-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-21=$version-r0 && \
apk add --no-cache amazon-corretto-21=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-21-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-21=$version-r0 && \
apk add --no-cache amazon-corretto-21=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-21-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-21=$version-r0 && \
apk add --no-cache amazon-corretto-21=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-21-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 21/slim/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-21=$version-r0 binutils && \
apk add --no-cache amazon-corretto-21=$version-r0 binutils font-droid && \
/usr/lib/jvm/default-jvm/bin/jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim && \
apk del binutils amazon-corretto-21 && \
mkdir -p /usr/lib/jvm/ && \
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-23=$version-r0 && \
apk add --no-cache amazon-corretto-23=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-23=$version-r0 && \
apk add --no-cache amazon-corretto-23=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-23=$version-r0 && \
apk add --no-cache amazon-corretto-23=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-23=$version-r0 && \
apk add --no-cache amazon-corretto-23=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 23/slim/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-23=$version-r0 binutils && \
apk add --no-cache amazon-corretto-23=$version-r0 binutils font-droid && \
/usr/lib/jvm/default-jvm/bin/jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim && \
apk del binutils amazon-corretto-23 && \
mkdir -p /usr/lib/jvm/ && \
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8=$version-r0 && \
apk add --no-cache amazon-corretto-8=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8=$version-r0 && \
apk add --no-cache amazon-corretto-8=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8=$version-r0 && \
apk add --no-cache amazon-corretto-8=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8=$version-r0 && \
apk add --no-cache amazon-corretto-8=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jre/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jre/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jre/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down
2 changes: 1 addition & 1 deletion 8/jre/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 && \
apk add --no-cache amazon-corretto-8-jre=$version-r0 font-droid && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


Expand Down

0 comments on commit a3c972f

Please sign in to comment.