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

remove legacy ENV variables #628

Merged
merged 3 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions 11/jdk/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jdk/ubi/ubi9-minimal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jdk/ubuntu/focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jdk/ubuntu/jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jdk/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/nanoserver-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/windowsservercore-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jre/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jre/ubi/ubi9-minimal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jre/ubuntu/focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jre/ubuntu/jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 11/jre/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
2 changes: 1 addition & 1 deletion 11/jre/windows/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion 11/jre/windows/nanoserver-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion 11/jre/windows/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
2 changes: 1 addition & 1 deletion 11/jre/windows/windowsservercore-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
6 changes: 3 additions & 3 deletions 17/jdk/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 17/jdk/ubi/ubi9-minimal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 17/jdk/ubuntu/focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 17/jdk/ubuntu/jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)"; \
Expand Down
6 changes: 3 additions & 3 deletions 17/jdk/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)"; \
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/windows/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/windows/nanoserver-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/windows/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
Loading
Loading