Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor official docker manifest script to be written in Python #715

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Jinja CI
on:
pull_request:
paths:
- .github/workflows/ci.yml
- dockerhub_doc_config_update.py
- generate_dockerfiles.py
- test_dockerhub_doc_config_update.py
- test_generate_dockerfiles.py
- requirements.txt
branches: [ main ]
Expand All @@ -23,5 +26,8 @@ jobs:
- name: Install dependencies
run: "pip3 install -r requirements.txt"

- name: Run tests
- name: Run test_generate_dockerfiles
run: "python3 test_generate_dockerfiles.py"

- name: Run test_dockerhub_doc_config_update
run: "python3 test_dockerhub_doc_config_update.py"
7 changes: 6 additions & 1 deletion .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,15 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: docker-library/bashbrew@9eef708e6a0b1b5d8bbda769c766777fe45026eb # v0.1.13
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: "3.x"
- name: Install dependencies
run: "pip3 install -r requirements.txt"
- id: generate-jobs
name: Generate Jobs
run: |
export GENERATE_STACKBREW_LIBRARY='./dockerhub_doc_config_update.sh /dev/stdout'
export GENERATE_STACKBREW_LIBRARY='python3 dockerhub_doc_config_update.py -o /dev/stdout'
export GITHUB_REPOSITORY="eclipse-temurin"
strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")"
echo "strategy=$strategy" >> "$GITHUB_OUTPUT"
Expand Down
61 changes: 34 additions & 27 deletions config/hotspot.yml → config/temurin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,50 +16,57 @@ supported_distributions:
OS: [alpine, focal, jammy, noble, ubi9-minimal, windowsservercore-1809, nanoserver-1809, windowsservercore-ltsc2022, nanoserver-ltsc2022]
Versions: [8, 11, 17, 21, 23]

metadata:
image_types: [jdk, jre]
latest_version: 21
default_linux_image: noble
default_alpine_image: alpine-3.21

configurations:

alpine-linux:
- directory: alpine/3.20
architectures: [aarch64, x64]
image: alpine:3.20
os: alpine-linux

- directory: alpine/3.21
architectures: [aarch64, x64]
image: alpine:3.21
os: alpine-linux

linux:
- directory: ubuntu/noble
image: ubuntu:24.04
architectures: [aarch64, arm, ppc64le, riscv64, s390x, x64]
- directory: ubuntu/focal
architectures: [aarch64, arm, ppc64le, s390x, x64]
image: ubuntu:20.04
deprecated: 20
os: ubuntu

- directory: ubuntu/jammy
image: ubuntu:22.04
architectures: [aarch64, arm, ppc64le, s390x, x64]
deprecated: 23
os: ubuntu

- directory: ubuntu/focal
architectures: [aarch64, arm, ppc64le, s390x, x64]
image: ubuntu:20.04
deprecated: 20
- directory: ubuntu/noble
image: ubuntu:24.04
architectures: [aarch64, arm, ppc64le, riscv64, s390x, x64]
os: ubuntu

- directory: ubi/ubi9-minimal
architectures: [aarch64, ppc64le, s390x, x64]
image: redhat/ubi9-minimal
os: ubi9-minimal

alpine-linux:
- directory: alpine/3.21
architectures: [aarch64, x64]
image: alpine:3.21
os: alpine-linux

- directory: alpine/3.20
architectures: [aarch64, x64]
image: alpine:3.20
os: alpine-linux

windows:
- directory: windows/windowsservercore-1809
- directory: windows/windowsservercore-ltsc2025
architectures: [x64]
image: mcr.microsoft.com/windows/servercore:1809
image: mcr.microsoft.com/windows/servercore:ltsc2025
os: servercore

- directory: windows/nanoserver-1809
- directory: windows/nanoserver-ltsc2025
architectures: [x64]
image: mcr.microsoft.com/windows/nanoserver:1809
image: mcr.microsoft.com/windows/nanoserver:ltsc2025
os: nanoserver

- directory: windows/windowsservercore-ltsc2022
Expand All @@ -72,12 +79,12 @@ configurations:
image: mcr.microsoft.com/windows/nanoserver:ltsc2022
os: nanoserver

- directory: windows/windowsservercore-ltsc2025
- directory: windows/windowsservercore-1809
architectures: [x64]
image: mcr.microsoft.com/windows/servercore:ltsc2025
image: mcr.microsoft.com/windows/servercore:1809
os: servercore

- directory: windows/nanoserver-ltsc2025
- directory: windows/nanoserver-1809
architectures: [x64]
image: mcr.microsoft.com/windows/nanoserver:ltsc2025
image: mcr.microsoft.com/windows/nanoserver:1809
os: nanoserver
Loading
Loading