Skip to content

Commit

Permalink
Merge pull request #211 from Autumn808/alpine-3.16-eol
Browse files Browse the repository at this point in the history 
Updated Alpine to 3.20
  • Loading branch information
@Autumn808
Autumn808 authored Jul 15, 2024
2 parents f07f63b + 2ba6fde commit cdae5f8
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify-images.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
fail-fast: false
matrix:
version: [ 8, 11, 17, 21, 22 ]
os_version: ["3.17", "3.18", "3.19"]
os_version: ["3.17", "3.18", "3.19", "3.20"]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down
22 changes: 22 additions & 0 deletions 11/jdk/alpine/3.20/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM alpine:3.20

ARG version=11.0.23.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
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 && \
rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip


ENV LANG C.UTF-8

ENV JAVA_HOME=/usr/lib/jvm/default-jvm
ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
22 changes: 22 additions & 0 deletions 17/jdk/alpine/3.20/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM alpine:3.20

ARG version=17.0.11.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
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 && \
rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip


ENV LANG C.UTF-8

ENV JAVA_HOME=/usr/lib/jvm/default-jvm
ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
22 changes: 22 additions & 0 deletions 21/jdk/alpine/3.20/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM alpine:3.20

ARG version=21.0.3.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
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 && \
rm -rf /usr/lib/jvm/java-21-amazon-corretto/lib/src.zip


ENV LANG C.UTF-8

ENV JAVA_HOME=/usr/lib/jvm/default-jvm
ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
22 changes: 22 additions & 0 deletions 22/jdk/alpine/3.20/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM alpine:3.20

ARG version=22.0.1.8.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
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-22=$version-r0 && \
rm -rf /usr/lib/jvm/java-22-amazon-corretto/lib/src.zip


ENV LANG C.UTF-8

ENV JAVA_HOME=/usr/lib/jvm/default-jvm
ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
22 changes: 22 additions & 0 deletions 8/jdk/alpine/3.20/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM alpine:3.20

ARG version=8.412.08.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
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 && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


ENV LANG C.UTF-8

ENV JAVA_HOME=/usr/lib/jvm/default-jvm
ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin
21 changes: 21 additions & 0 deletions 8/jre/alpine/3.20/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM alpine:3.20

ARG version=8.412.08.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \
echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \
tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \
rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \
wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \
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 && \
rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip


ENV LANG C.UTF-8

ENV JAVA_HOME=/usr/lib/jvm/default-jvm/jre
2 changes: 1 addition & 1 deletion bin/apply-template.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def process_template_files(major_version, version, platform):
input_parameter['MAJOR_VERSION'] = major_version
if platform == 'alpine':
# Update .github/workflows/verify-images.yml as well when alpine versions changes
os_versions = ['3.17', '3.18', '3.19']
os_versions = ['3.17', '3.18', '3.19', '3.20']
try:
shutil.rmtree(f"{major_version}/jdk/{platform}")
shutil.rmtree(f"{major_version}/jre/{platform}")
Expand Down
4 changes: 2 additions & 2 deletions bin/tag-generator.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json

DEFAULT_ALPINE_VERSION = '3.19'
ALPINE_VERSIONS = ['3.17', '3.18', '3.19']
DEFAULT_ALPINE_VERSION = '3.20'
ALPINE_VERSIONS = ['3.17', '3.18', '3.19', '3.20']

def generate_tags(key, version):
update = version.split('.')[1] if (key == '8') else version.split('.')[2]
Expand Down

1 comment on commit cdae5f8

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contents for library/amazoncorretto:

updated tags for [library/amazoncorretto](https://github.com/docker-library/official-images/blob/master/library/amazoncorretto) 
GitCommit: cdae5f875053c51872b41c74ccfeca97877f31a1

Tags: 8, 8u412, 8u412-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u412-al2-generic, 8-al2-generic-jdk, latest
Architectures: amd64, arm64v8
Directory: 8/jdk/al2-generic

Tags: 8-al2023, 8u412-al2023, 8-al2023-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/al2023

Tags: 8-al2023-jre, 8u412-al2023-jre
Architectures: amd64, arm64v8
Directory: 8/jdk/al2023

Tags: 8-al2-native-jre, 8u412-al2-native-jre
Architectures: amd64, arm64v8
Directory: 8/jre/al2

Tags: 8-al2-native-jdk, 8u412-al2-native-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/al2

Tags: 8-alpine3.17, 8u412-alpine3.17, 8-alpine3.17-full, 8-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.17

Tags: 8-alpine3.17-jre, 8u412-alpine3.17-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.17

Tags: 8-alpine3.18, 8u412-alpine3.18, 8-alpine3.18-full, 8-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.18

Tags: 8-alpine3.18-jre, 8u412-alpine3.18-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.18

Tags: 8-alpine3.19, 8u412-alpine3.19, 8-alpine3.19-full, 8-alpine3.19-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.19

Tags: 8-alpine3.19-jre, 8u412-alpine3.19-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.19

Tags: 8-alpine3.20, 8u412-alpine3.20, 8-alpine3.20-full, 8-alpine3.20-jdk, 8-alpine, 8u412-alpine, 8-alpine-full, 8-alpine-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.20

Tags: 8-alpine3.20-jre, 8u412-alpine3.20-jre, 8-alpine-jre, 8u412-alpine-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.20

Tags: 11, 11.0.23, 11.0.23-al2, 11-al2-full, 11-al2-jdk, 11-al2-generic, 11.0.23-al2-generic, 11-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/al2-generic

Tags: 11-al2023, 11.0.23-al2023, 11-al2023-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/al2023

Tags: 11-al2023-headless, 11.0.23-al2023-headless
Architectures: amd64, arm64v8
Directory: 11/headless/al2023

Tags: 11-al2023-headful, 11.0.23-al2023-headful
Architectures: amd64, arm64v8
Directory: 11/headful/al2023

Tags: 11-al2-native-headless, 11.0.23-al2-native-headless
Architectures: amd64, arm64v8
Directory: 11/headless/al2

Tags: 11-al2-native-jdk, 11.0.23-al2-native-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/al2

Tags: 11-alpine3.17, 11.0.23-alpine3.17, 11-alpine3.17-full, 11-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.17

Tags: 11-alpine3.18, 11.0.23-alpine3.18, 11-alpine3.18-full, 11-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.18

Tags: 11-alpine3.19, 11.0.23-alpine3.19, 11-alpine3.19-full, 11-alpine3.19-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.19

Tags: 11-alpine3.20, 11.0.23-alpine3.20, 11-alpine3.20-full, 11-alpine3.20-jdk, 11-alpine, 11.0.23-alpine, 11-alpine-full, 11-alpine-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.20

Tags: 17, 17.0.11, 17.0.11-al2, 17-al2-full, 17-al2-jdk, 17-al2-generic, 17.0.11-al2-generic, 17-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/al2-generic

Tags: 17-al2023, 17.0.11-al2023, 17-al2023-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/al2023

Tags: 17-al2023-headless, 17.0.11-al2023-headless
Architectures: amd64, arm64v8
Directory: 17/headless/al2023

Tags: 17-al2023-headful, 17.0.11-al2023-headful
Architectures: amd64, arm64v8
Directory: 17/headful/al2023

Tags: 17-al2-native-headless, 17.0.11-al2-native-headless
Architectures: amd64, arm64v8
Directory: 17/headless/al2

Tags: 17-al2-native-headful, 17.0.11-al2-native-headful
Architectures: amd64, arm64v8
Directory: 17/headful/al2

Tags: 17-al2-native-jdk, 17.0.11-al2-native-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/al2

Tags: 17-alpine3.17, 17.0.11-alpine3.17, 17-alpine3.17-full, 17-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.17

Tags: 17-alpine3.18, 17.0.11-alpine3.18, 17-alpine3.18-full, 17-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.18

Tags: 17-alpine3.19, 17.0.11-alpine3.19, 17-alpine3.19-full, 17-alpine3.19-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.19

Tags: 17-alpine3.20, 17.0.11-alpine3.20, 17-alpine3.20-full, 17-alpine3.20-jdk, 17-alpine, 17.0.11-alpine, 17-alpine-full, 17-alpine-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.20

Tags: 21, 21.0.3, 21.0.3-al2, 21-al2-full, 21-al2-jdk, 21-al2-generic, 21.0.3-al2-generic, 21-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/al2-generic

Tags: 21-al2023, 21.0.3-al2023, 21-al2023-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/al2023

Tags: 21-al2023-headless, 21.0.3-al2023-headless
Architectures: amd64, arm64v8
Directory: 21/headless/al2023

Tags: 21-al2023-headful, 21.0.3-al2023-headful
Architectures: amd64, arm64v8
Directory: 21/headful/al2023

Tags: 21-alpine3.17, 21.0.3-alpine3.17, 21-alpine3.17-full, 21-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.17

Tags: 21-alpine3.18, 21.0.3-alpine3.18, 21-alpine3.18-full, 21-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.18

Tags: 21-alpine3.19, 21.0.3-alpine3.19, 21-alpine3.19-full, 21-alpine3.19-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.19

Tags: 21-alpine3.20, 21.0.3-alpine3.20, 21-alpine3.20-full, 21-alpine3.20-jdk, 21-alpine, 21.0.3-alpine, 21-alpine-full, 21-alpine-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.20

Tags: 22-al2023, 22.0.1-al2023, 22-al2023-jdk, 22, 22-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/al2023

Tags: 22-al2023-headless, 22.0.1-al2023-headless, 22-headless
Architectures: amd64, arm64v8
Directory: 22/headless/al2023

Tags: 22-al2023-headful, 22.0.1-al2023-headful, 22-headful
Architectures: amd64, arm64v8
Directory: 22/headful/al2023

Tags: 22-alpine3.17, 22.0.1-alpine3.17, 22-alpine3.17-full, 22-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.17

Tags: 22-alpine3.18, 22.0.1-alpine3.18, 22-alpine3.18-full, 22-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.18

Tags: 22-alpine3.19, 22.0.1-alpine3.19, 22-alpine3.19-full, 22-alpine3.19-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.19

Tags: 22-alpine3.20, 22.0.1-alpine3.20, 22-alpine3.20-full, 22-alpine3.20-jdk, 22-alpine, 22.0.1-alpine, 22-alpine-full, 22-alpine-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.20

Please sign in to comment.