From d3eaa6b6afb486d017d72aa324b8045f376eac51 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 8 Aug 2024 10:00:09 +0100 Subject: [PATCH] remove legacy ENV variables --- 11/jdk/alpine/Dockerfile | 6 +++--- 11/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 11/jdk/ubuntu/focal/Dockerfile | 6 +++--- 11/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 11/jdk/ubuntu/noble/Dockerfile | 6 +++--- 11/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 11/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 11/jre/alpine/Dockerfile | 6 +++--- 11/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 11/jre/ubuntu/focal/Dockerfile | 6 +++--- 11/jre/ubuntu/jammy/Dockerfile | 6 +++--- 11/jre/ubuntu/noble/Dockerfile | 6 +++--- 11/jre/windows/nanoserver-1809/Dockerfile | 2 +- 11/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 11/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 17/jdk/alpine/Dockerfile | 6 +++--- 17/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 17/jdk/ubuntu/focal/Dockerfile | 6 +++--- 17/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 17/jdk/ubuntu/noble/Dockerfile | 6 +++--- 17/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 17/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 17/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 17/jre/alpine/Dockerfile | 6 +++--- 17/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 17/jre/ubuntu/focal/Dockerfile | 6 +++--- 17/jre/ubuntu/jammy/Dockerfile | 6 +++--- 17/jre/ubuntu/noble/Dockerfile | 6 +++--- 17/jre/windows/nanoserver-1809/Dockerfile | 2 +- 17/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 17/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 21/jdk/alpine/Dockerfile | 6 +++--- 21/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 21/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 21/jdk/ubuntu/noble/Dockerfile | 6 +++--- 21/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 21/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 21/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 21/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 21/jre/alpine/Dockerfile | 6 +++--- 21/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 21/jre/ubuntu/jammy/Dockerfile | 6 +++--- 21/jre/ubuntu/noble/Dockerfile | 6 +++--- 21/jre/windows/nanoserver-1809/Dockerfile | 2 +- 21/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 21/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 21/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 22/jdk/alpine/Dockerfile | 6 +++--- 22/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 22/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 22/jdk/ubuntu/noble/Dockerfile | 6 +++--- 22/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 22/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 22/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 22/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 22/jre/alpine/Dockerfile | 6 +++--- 22/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 22/jre/ubuntu/jammy/Dockerfile | 6 +++--- 22/jre/ubuntu/noble/Dockerfile | 6 +++--- 22/jre/windows/nanoserver-1809/Dockerfile | 2 +- 22/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 22/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 22/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 8/jdk/alpine/Dockerfile | 6 +++--- 8/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 8/jdk/ubuntu/focal/Dockerfile | 6 +++--- 8/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 8/jdk/ubuntu/noble/Dockerfile | 6 +++--- 8/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 8/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 8/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 8/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 8/jre/alpine/Dockerfile | 6 +++--- 8/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 8/jre/ubuntu/focal/Dockerfile | 6 +++--- 8/jre/ubuntu/jammy/Dockerfile | 6 +++--- 8/jre/ubuntu/noble/Dockerfile | 6 +++--- 8/jre/windows/nanoserver-1809/Dockerfile | 2 +- 8/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 8/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 8/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- docker_templates/alpine-linux.Dockerfile.j2 | 2 +- docker_templates/nanoserver.Dockerfile.j2 | 2 +- docker_templates/partials/java-version.j2 | 1 + docker_templates/partials/nix-env.j2 | 4 ++-- docker_templates/servercore.Dockerfile.j2 | 2 +- docker_templates/ubi9-minimal.Dockerfile.j2 | 2 +- docker_templates/ubuntu.Dockerfile.j2 | 2 +- 93 files changed, 186 insertions(+), 185 deletions(-) create mode 100644 docker_templates/partials/java-version.j2 diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index 6b2dc1b78..f794ee80e 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index 736333018..fb74369ed 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index 7785724f2..2830bec89 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index b32ecab9b..16600607f 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile index dc0797cca..0828af4b1 100644 --- a/11/jdk/ubuntu/noble/Dockerfile +++ b/11/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile b/11/jdk/windows/nanoserver-1809/Dockerfile index 4b08d43a5..d0f9578c3 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile +++ b/11/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile index c50508130..68ed2b16b 100644 --- a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile b/11/jdk/windows/windowsservercore-1809/Dockerfile index 0cde96461..707c52573 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 75cf96a7e..e21fbf875 100644 --- a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index f5254041e..dca64d04b 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 25a03b51c..250247279 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index e55c6226a..2fc749897 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index 1438bd97d..201829cf3 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jre/ubuntu/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index e1ecfaed3..4e5246729 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jre/windows/nanoserver-1809/Dockerfile b/11/jre/windows/nanoserver-1809/Dockerfile index ebd8f4c6c..14a0961c2 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile +++ b/11/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jre/windows/nanoserver-ltsc2022/Dockerfile b/11/jre/windows/nanoserver-ltsc2022/Dockerfile index b45eb7ef1..00f5409cd 100644 --- a/11/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile b/11/jre/windows/windowsservercore-1809/Dockerfile index 880ee7662..5d04cb2f4 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile +++ b/11/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile index 8b83a3f61..0bfb2acbc 100644 --- a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index b9a1fad7c..024529259 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -48,7 +48,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index f084a7057..a83e5fe9f 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index dfcfd223f..009178a50 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 132a94f11..0927e15f4 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jdk/ubuntu/noble/Dockerfile b/17/jdk/ubuntu/noble/Dockerfile index f9ef5f4a0..ae2d813a5 100644 --- a/17/jdk/ubuntu/noble/Dockerfile +++ b/17/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jdk/windows/nanoserver-1809/Dockerfile b/17/jdk/windows/nanoserver-1809/Dockerfile index 4f6d21e53..4e86ec4ef 100644 --- a/17/jdk/windows/nanoserver-1809/Dockerfile +++ b/17/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile index 8d0bfa294..be1c2e278 100644 --- a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jdk/windows/windowsservercore-1809/Dockerfile b/17/jdk/windows/windowsservercore-1809/Dockerfile index 1826e2d59..efdcdc036 100644 --- a/17/jdk/windows/windowsservercore-1809/Dockerfile +++ b/17/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile index a152fef82..8d98eafd6 100644 --- a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 32554041b..8826ade0e 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index 9ccc76d3a..50364992c 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index 2f9f36f23..ff0a99aab 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index b2598c80e..b6e91441c 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jre/ubuntu/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 9cb7a195c..d399dcf00 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jre/windows/nanoserver-1809/Dockerfile b/17/jre/windows/nanoserver-1809/Dockerfile index 6a7ea9cad..ad4d7502d 100644 --- a/17/jre/windows/nanoserver-1809/Dockerfile +++ b/17/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jre/windows/nanoserver-ltsc2022/Dockerfile b/17/jre/windows/nanoserver-ltsc2022/Dockerfile index 345d14587..30eba22aa 100644 --- a/17/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/17/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jre/windows/windowsservercore-1809/Dockerfile b/17/jre/windows/windowsservercore-1809/Dockerfile index 25eb6e4a4..da8c3afa5 100644 --- a/17/jre/windows/windowsservercore-1809/Dockerfile +++ b/17/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile index b2978d704..f6086c28e 100644 --- a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index 01bae8796..44a9104d7 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -48,7 +48,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index 375f97d2e..91428f2e4 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index 133239fbc..4793ec038 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jdk/ubuntu/noble/Dockerfile b/21/jdk/ubuntu/noble/Dockerfile index 5aae3ad2d..5284abdfa 100644 --- a/21/jdk/ubuntu/noble/Dockerfile +++ b/21/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jdk/windows/nanoserver-1809/Dockerfile b/21/jdk/windows/nanoserver-1809/Dockerfile index f14440fad..c86f7fb1e 100644 --- a/21/jdk/windows/nanoserver-1809/Dockerfile +++ b/21/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile index ad58ac7d8..5408206ba 100644 --- a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jdk/windows/windowsservercore-1809/Dockerfile b/21/jdk/windows/windowsservercore-1809/Dockerfile index f645044a9..a02936f60 100644 --- a/21/jdk/windows/windowsservercore-1809/Dockerfile +++ b/21/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 0b89e1517..a2eb3883f 100644 --- a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index 52799021d..71a2b3f2a 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index d14d86656..27c17f6b9 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index a7d00900f..04099fff9 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index f8b6ac128..6f04b6c05 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jre/windows/nanoserver-1809/Dockerfile b/21/jre/windows/nanoserver-1809/Dockerfile index 849fe8119..b20591f89 100644 --- a/21/jre/windows/nanoserver-1809/Dockerfile +++ b/21/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jre/windows/nanoserver-ltsc2022/Dockerfile b/21/jre/windows/nanoserver-ltsc2022/Dockerfile index 78481dd3c..1c19caae6 100644 --- a/21/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/21/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jre/windows/windowsservercore-1809/Dockerfile b/21/jre/windows/windowsservercore-1809/Dockerfile index da8e75495..222455d23 100644 --- a/21/jre/windows/windowsservercore-1809/Dockerfile +++ b/21/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile index 8b03a818b..25cb3afb6 100644 --- a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/22/jdk/alpine/Dockerfile b/22/jdk/alpine/Dockerfile index 5b20df4d8..b4df99423 100644 --- a/22/jdk/alpine/Dockerfile +++ b/22/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -48,7 +48,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/22/jdk/ubi/ubi9-minimal/Dockerfile b/22/jdk/ubi/ubi9-minimal/Dockerfile index fa33c10fa..7ee4b8d47 100644 --- a/22/jdk/ubi/ubi9-minimal/Dockerfile +++ b/22/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/22/jdk/ubuntu/jammy/Dockerfile b/22/jdk/ubuntu/jammy/Dockerfile index ec0f33034..e8f3ba9b3 100644 --- a/22/jdk/ubuntu/jammy/Dockerfile +++ b/22/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -47,7 +47,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jdk/ubuntu/noble/Dockerfile b/22/jdk/ubuntu/noble/Dockerfile index 39fce803e..0cf87c96e 100644 --- a/22/jdk/ubuntu/noble/Dockerfile +++ b/22/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -47,7 +47,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jdk/windows/nanoserver-1809/Dockerfile b/22/jdk/windows/nanoserver-1809/Dockerfile index a5d4e09ba..46c9515dd 100644 --- a/22/jdk/windows/nanoserver-1809/Dockerfile +++ b/22/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jdk/windows/nanoserver-ltsc2022/Dockerfile b/22/jdk/windows/nanoserver-ltsc2022/Dockerfile index 9bb8993c3..36788c34c 100644 --- a/22/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/22/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jdk/windows/windowsservercore-1809/Dockerfile b/22/jdk/windows/windowsservercore-1809/Dockerfile index 7aca8f36e..503d25f16 100644 --- a/22/jdk/windows/windowsservercore-1809/Dockerfile +++ b/22/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile index c5a441539..2ba0b5695 100644 --- a/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/22/jre/alpine/Dockerfile b/22/jre/alpine/Dockerfile index f27a32121..cc16b2fbb 100644 --- a/22/jre/alpine/Dockerfile +++ b/22/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/22/jre/ubi/ubi9-minimal/Dockerfile b/22/jre/ubi/ubi9-minimal/Dockerfile index da209dcac..cdfe9fe86 100644 --- a/22/jre/ubi/ubi9-minimal/Dockerfile +++ b/22/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/22/jre/ubuntu/jammy/Dockerfile b/22/jre/ubuntu/jammy/Dockerfile index 46e2cbadd..f46bf8a0f 100644 --- a/22/jre/ubuntu/jammy/Dockerfile +++ b/22/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jre/ubuntu/noble/Dockerfile b/22/jre/ubuntu/noble/Dockerfile index 1bda68aa5..6ad939f8b 100644 --- a/22/jre/ubuntu/noble/Dockerfile +++ b/22/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jre/windows/nanoserver-1809/Dockerfile b/22/jre/windows/nanoserver-1809/Dockerfile index 22201ab09..08888ab21 100644 --- a/22/jre/windows/nanoserver-1809/Dockerfile +++ b/22/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jre/windows/nanoserver-ltsc2022/Dockerfile b/22/jre/windows/nanoserver-ltsc2022/Dockerfile index 4a8d37113..e704f7396 100644 --- a/22/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/22/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jre/windows/windowsservercore-1809/Dockerfile b/22/jre/windows/windowsservercore-1809/Dockerfile index 8e6ff35f2..2e9753b40 100644 --- a/22/jre/windows/windowsservercore-1809/Dockerfile +++ b/22/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/22/jre/windows/windowsservercore-ltsc2022/Dockerfile b/22/jre/windows/windowsservercore-ltsc2022/Dockerfile index 9785d07d0..1c993c1c0 100644 --- a/22/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/22/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile index 0c5489763..6068d7e08 100644 --- a/8/jdk/alpine/Dockerfile +++ b/8/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index 47229398d..9c9247223 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index ff1850935..ce883ba73 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index c6f272a92..cecbedd4e 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jdk/ubuntu/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index 59ea675c2..fa1634651 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile b/8/jdk/windows/nanoserver-1809/Dockerfile index 850540eba..f5069d5ee 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile +++ b/8/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile index 69424d228..6933b6e79 100644 --- a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile b/8/jdk/windows/windowsservercore-1809/Dockerfile index 48e9d9b4b..d6feaeb4b 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 50f75fd22..c4ae0cd7c 100644 --- a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile index c25b62992..b36de2ddc 100644 --- a/8/jre/alpine/Dockerfile +++ b/8/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index 2724e6d6b..fd263dc6e 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index 83c57b899..0d0b45e7f 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 1ae8f2c2a..190f3b413 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jre/ubuntu/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index e97bf7008..fd92fca3c 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jre/windows/nanoserver-1809/Dockerfile b/8/jre/windows/nanoserver-1809/Dockerfile index 958458754..beeb0644d 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile +++ b/8/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile b/8/jre/windows/nanoserver-ltsc2022/Dockerfile index dd1f96704..9ea4aa23b 100644 --- a/8/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile b/8/jre/windows/windowsservercore-1809/Dockerfile index e7dc705ca..93c4c4f41 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile +++ b/8/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile index a8a82d8ea..096ccd558 100644 --- a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 41d379279..1b1a26029 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -25,7 +25,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} {% include 'partials/multi-arch-install.j2' %} diff --git a/docker_templates/nanoserver.Dockerfile.j2 b/docker_templates/nanoserver.Dockerfile.j2 index 7341568bc..15a10abb5 100644 --- a/docker_templates/nanoserver.Dockerfile.j2 +++ b/docker_templates/nanoserver.Dockerfile.j2 @@ -4,7 +4,7 @@ FROM {{ base_image }} SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} ENV JAVA_HOME C:\\openjdk-{{ version }} # "ERROR: Access to the registry path is denied." diff --git a/docker_templates/partials/java-version.j2 b/docker_templates/partials/java-version.j2 new file mode 100644 index 000000000..8f66e6acd --- /dev/null +++ b/docker_templates/partials/java-version.j2 @@ -0,0 +1 @@ +ENV JAVA_VERSION={{ java_version }} \ No newline at end of file diff --git a/docker_templates/partials/nix-env.j2 b/docker_templates/partials/nix-env.j2 index 3a8a7e247..0d19c9841 100644 --- a/docker_templates/partials/nix-env.j2 +++ b/docker_templates/partials/nix-env.j2 @@ -1,5 +1,5 @@ -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +ENV PATH=$JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' diff --git a/docker_templates/servercore.Dockerfile.j2 b/docker_templates/servercore.Dockerfile.j2 index 45d0e6d83..56521ab75 100644 --- a/docker_templates/servercore.Dockerfile.j2 +++ b/docker_templates/servercore.Dockerfile.j2 @@ -5,7 +5,7 @@ FROM {{ base_image }} # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} RUN Write-Host ('Downloading {{ arch_data.download_url }} ...'); \ curl.exe -LfsSo openjdk.msi {{ arch_data.download_url }} ; \ diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index c8680184d..82b40fe29 100644 --- a/docker_templates/ubi9-minimal.Dockerfile.j2 +++ b/docker_templates/ubi9-minimal.Dockerfile.j2 @@ -23,7 +23,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} {% include 'partials/multi-arch-install.j2' %} diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index 05dac147a..1a5050d7d 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -28,7 +28,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} {% include 'partials/multi-arch-install.j2' %} \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472