Merge remote-tracking branch 'upstream/main' into altag

adoptium · Jan 23, 2025 · d5deca3 · d5deca3
2 parents dbeafd3 + c308d7b
commit d5deca3
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 43 deletions.
diff --git a/17/jdk/windows/nanoserver-1809/Dockerfile b/17/jdk/windows/nanoserver-1809/Dockerfile
diff --git a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/17/jdk/windows/nanoserver-ltsc2025/Dockerfile b/17/jdk/windows/nanoserver-ltsc2025/Dockerfile
diff --git a/17/jdk/windows/windowsservercore-1809/Dockerfile b/17/jdk/windows/windowsservercore-1809/Dockerfile
diff --git a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/17/jdk/windows/windowsservercore-ltsc2025/Dockerfile b/17/jdk/windows/windowsservercore-ltsc2025/Dockerfile
diff --git a/17/jre/windows/nanoserver-1809/Dockerfile b/17/jre/windows/nanoserver-1809/Dockerfile
diff --git a/17/jre/windows/nanoserver-ltsc2022/Dockerfile b/17/jre/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/17/jre/windows/nanoserver-ltsc2025/Dockerfile b/17/jre/windows/nanoserver-ltsc2025/Dockerfile
diff --git a/17/jre/windows/windowsservercore-1809/Dockerfile b/17/jre/windows/windowsservercore-1809/Dockerfile
diff --git a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/17/jre/windows/windowsservercore-ltsc2025/Dockerfile b/17/jre/windows/windowsservercore-ltsc2025/Dockerfile
diff --git a/dockerhub_doc_config_update.py b/dockerhub_doc_config_update.py
@@ -299,7 +299,6 @@ def main():
                 for os_family, configurations in config["configurations"].items():
                     for configuration in configurations:
                         directory = configuration["directory"]
-                        os_name = configuration["os"]
                         for dockerfile in Path(".").rglob(
                             f"{ver}/{pkg}/{directory}/Dockerfile"
                         ):