Skip to content

Commit 0327d46

Browse files
authored
remove legacy ENV variables (#628)
* remove legacy ENV variables * fix doc generator * simplify
1 parent 3f6f642 commit 0327d46

File tree

94 files changed

+187
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+187
-186
lines changed

11/jdk/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.20
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -45,7 +45,7 @@ RUN set -eux; \
4545
; \
4646
rm -rf /var/cache/apk/*
4747

48-
ENV JAVA_VERSION jdk-11.0.24+8
48+
ENV JAVA_VERSION=jdk-11.0.24+8
4949

5050
RUN set -eux; \
5151
ARCH="$(apk --print-arch)"; \

11/jdk/ubi/ubi9-minimal/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM redhat/ubi9-minimal
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
; \
4545
microdnf clean all
4646

47-
ENV JAVA_VERSION jdk-11.0.24+8
47+
ENV JAVA_VERSION=jdk-11.0.24+8
4848

4949
RUN set -eux; \
5050
ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \

11/jdk/ubuntu/focal/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:20.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
locale-gen en_US.UTF-8; \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
ENV JAVA_VERSION jdk-11.0.24+8
49+
ENV JAVA_VERSION=jdk-11.0.24+8
5050

5151
RUN set -eux; \
5252
ARCH="$(dpkg --print-architecture)"; \

11/jdk/ubuntu/jammy/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:22.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
locale-gen en_US.UTF-8; \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
ENV JAVA_VERSION jdk-11.0.24+8
49+
ENV JAVA_VERSION=jdk-11.0.24+8
5050

5151
RUN set -eux; \
5252
ARCH="$(dpkg --print-architecture)"; \

11/jdk/ubuntu/noble/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:24.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
locale-gen en_US.UTF-8; \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
ENV JAVA_VERSION jdk-11.0.24+8
49+
ENV JAVA_VERSION=jdk-11.0.24+8
5050

5151
RUN set -eux; \
5252
ARCH="$(dpkg --print-architecture)"; \

11/jdk/windows/nanoserver-1809/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
2121

2222
SHELL ["cmd", "/s", "/c"]
2323

24-
ENV JAVA_VERSION jdk-11.0.24+8
24+
ENV JAVA_VERSION=jdk-11.0.24+8
2525

2626
ENV JAVA_HOME C:\\openjdk-11
2727
# "ERROR: Access to the registry path is denied."

11/jdk/windows/nanoserver-ltsc2022/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
2121

2222
SHELL ["cmd", "/s", "/c"]
2323

24-
ENV JAVA_VERSION jdk-11.0.24+8
24+
ENV JAVA_VERSION=jdk-11.0.24+8
2525

2626
ENV JAVA_HOME C:\\openjdk-11
2727
# "ERROR: Access to the registry path is denied."

11/jdk/windows/windowsservercore-1809/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
2222
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
2323
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
2424

25-
ENV JAVA_VERSION jdk-11.0.24+8
25+
ENV JAVA_VERSION=jdk-11.0.24+8
2626

2727
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 ...'); \
2828
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 ; \

11/jdk/windows/windowsservercore-ltsc2022/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022
2222
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
2323
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
2424

25-
ENV JAVA_VERSION jdk-11.0.24+8
25+
ENV JAVA_VERSION=jdk-11.0.24+8
2626

2727
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 ...'); \
2828
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 ; \

11/jre/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.20
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -45,7 +45,7 @@ RUN set -eux; \
4545
; \
4646
rm -rf /var/cache/apk/*
4747

48-
ENV JAVA_VERSION jdk-11.0.24+8
48+
ENV JAVA_VERSION=jdk-11.0.24+8
4949

5050
RUN set -eux; \
5151
ARCH="$(apk --print-arch)"; \

11/jre/ubi/ubi9-minimal/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM redhat/ubi9-minimal
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
; \
4545
microdnf clean all
4646

47-
ENV JAVA_VERSION jdk-11.0.24+8
47+
ENV JAVA_VERSION=jdk-11.0.24+8
4848

4949
RUN set -eux; \
5050
ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \

11/jre/ubuntu/focal/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:20.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
locale-gen en_US.UTF-8; \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
ENV JAVA_VERSION jdk-11.0.24+8
49+
ENV JAVA_VERSION=jdk-11.0.24+8
5050

5151
RUN set -eux; \
5252
ARCH="$(dpkg --print-architecture)"; \

11/jre/ubuntu/jammy/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:22.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
locale-gen en_US.UTF-8; \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
ENV JAVA_VERSION jdk-11.0.24+8
49+
ENV JAVA_VERSION=jdk-11.0.24+8
5050

5151
RUN set -eux; \
5252
ARCH="$(dpkg --print-architecture)"; \

11/jre/ubuntu/noble/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:24.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -46,7 +46,7 @@ RUN set -eux; \
4646
locale-gen en_US.UTF-8; \
4747
rm -rf /var/lib/apt/lists/*
4848

49-
ENV JAVA_VERSION jdk-11.0.24+8
49+
ENV JAVA_VERSION=jdk-11.0.24+8
5050

5151
RUN set -eux; \
5252
ARCH="$(dpkg --print-architecture)"; \

11/jre/windows/nanoserver-1809/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
2121

2222
SHELL ["cmd", "/s", "/c"]
2323

24-
ENV JAVA_VERSION jdk-11.0.24+8
24+
ENV JAVA_VERSION=jdk-11.0.24+8
2525

2626
ENV JAVA_HOME C:\\openjdk-11
2727
# "ERROR: Access to the registry path is denied."

11/jre/windows/nanoserver-ltsc2022/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
2121

2222
SHELL ["cmd", "/s", "/c"]
2323

24-
ENV JAVA_VERSION jdk-11.0.24+8
24+
ENV JAVA_VERSION=jdk-11.0.24+8
2525

2626
ENV JAVA_HOME C:\\openjdk-11
2727
# "ERROR: Access to the registry path is denied."

11/jre/windows/windowsservercore-1809/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
2222
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
2323
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
2424

25-
ENV JAVA_VERSION jdk-11.0.24+8
25+
ENV JAVA_VERSION=jdk-11.0.24+8
2626

2727
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 ...'); \
2828
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 ; \

11/jre/windows/windowsservercore-ltsc2022/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022
2222
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
2323
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
2424

25-
ENV JAVA_VERSION jdk-11.0.24+8
25+
ENV JAVA_VERSION=jdk-11.0.24+8
2626

2727
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 ...'); \
2828
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 ; \

17/jdk/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM alpine:3.20
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -48,7 +48,7 @@ RUN set -eux; \
4848
; \
4949
rm -rf /var/cache/apk/*
5050

51-
ENV JAVA_VERSION jdk-17.0.12+7
51+
ENV JAVA_VERSION=jdk-17.0.12+7
5252

5353
RUN set -eux; \
5454
ARCH="$(apk --print-arch)"; \

17/jdk/ubi/ubi9-minimal/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM redhat/ubi9-minimal
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
; \
4545
microdnf clean all
4646

47-
ENV JAVA_VERSION jdk-17.0.12+7
47+
ENV JAVA_VERSION=jdk-17.0.12+7
4848

4949
RUN set -eux; \
5050
ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \

17/jdk/ubuntu/focal/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:20.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -49,7 +49,7 @@ RUN set -eux; \
4949
locale-gen en_US.UTF-8; \
5050
rm -rf /var/lib/apt/lists/*
5151

52-
ENV JAVA_VERSION jdk-17.0.12+7
52+
ENV JAVA_VERSION=jdk-17.0.12+7
5353

5454
RUN set -eux; \
5555
ARCH="$(dpkg --print-architecture)"; \

17/jdk/ubuntu/jammy/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:22.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -49,7 +49,7 @@ RUN set -eux; \
4949
locale-gen en_US.UTF-8; \
5050
rm -rf /var/lib/apt/lists/*
5151

52-
ENV JAVA_VERSION jdk-17.0.12+7
52+
ENV JAVA_VERSION=jdk-17.0.12+7
5353

5454
RUN set -eux; \
5555
ARCH="$(dpkg --print-architecture)"; \

17/jdk/ubuntu/noble/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
FROM ubuntu:24.04
2121

22-
ENV JAVA_HOME /opt/java/openjdk
23-
ENV PATH $JAVA_HOME/bin:$PATH
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
2424

2525
# Default to UTF-8 file.encoding
2626
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
@@ -49,7 +49,7 @@ RUN set -eux; \
4949
locale-gen en_US.UTF-8; \
5050
rm -rf /var/lib/apt/lists/*
5151

52-
ENV JAVA_VERSION jdk-17.0.12+7
52+
ENV JAVA_VERSION=jdk-17.0.12+7
5353

5454
RUN set -eux; \
5555
ARCH="$(dpkg --print-architecture)"; \

17/jdk/windows/nanoserver-1809/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
2121

2222
SHELL ["cmd", "/s", "/c"]
2323

24-
ENV JAVA_VERSION jdk-17.0.12+7
24+
ENV JAVA_VERSION=jdk-17.0.12+7
2525

2626
ENV JAVA_HOME C:\\openjdk-17
2727
# "ERROR: Access to the registry path is denied."

17/jdk/windows/nanoserver-ltsc2022/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
2121

2222
SHELL ["cmd", "/s", "/c"]
2323

24-
ENV JAVA_VERSION jdk-17.0.12+7
24+
ENV JAVA_VERSION=jdk-17.0.12+7
2525

2626
ENV JAVA_HOME C:\\openjdk-17
2727
# "ERROR: Access to the registry path is denied."

17/jdk/windows/windowsservercore-1809/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809
2222
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
2323
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
2424

25-
ENV JAVA_VERSION jdk-17.0.12+7
25+
ENV JAVA_VERSION=jdk-17.0.12+7
2626

2727
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 ...'); \
2828
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 ; \

0 commit comments

Comments
 (0)