Skip to content

Commit 47843c9

Browse files
zZHorizonZzzZHorizonZz
committed
Added link to gpg key and remove verbose logging
1 parent 788df2f commit 47843c9

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎22/windows-2019/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
44

55
# PATH isn't actually set in the Docker image, so we have to set it from within the container
66
RUN $newPath = ('C:\Program Files (x86)\GnuPG\bin;{0}' -f $env:PATH); \
7-
Write-Host ('Updating PATH: {0}' -f $newPath); \
8-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
7+
Write-Host ('Updating PATH: {0}' -f $newPath); \
8+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
99
# doing this first to share cache across versions more aggressively
1010

1111
ENV NODE_VERSION 22.8.0
1212
ENV NODE_CHECKSUM d6e1c4fca93997224cac0bec09b4201aa018f50171d38c6b85abe483012839c9
1313

14-
# Version and checksum of the GPG installer (Source: https://lists.gnupg.org/pipermail/gnupg-announce/2024q3/000484.html)
14+
# Version and checksum of the GPG installer (Source: https://www.gnupg.org/download/integrity_check.html)
1515
ENV GPG_VERSION 2.4.5_20240307
1616
ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc1
1717

@@ -34,9 +34,9 @@ RUN @( \
3434
'A363A499291CBBC940DD62E41F10027AF002F8B0', \
3535
'CC68F5A3106FF448322E48ED27F5E38D5B0A215F' \
3636
) | foreach { \
37-
gpg --batch --keyserver hkps://keys.openpgp.org --verbose --recv-keys $_ ; \
37+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
3838
if (-not $?) { \
39-
gpg --batch --keyserver keyserver.ubuntu.com --verbose --recv-keys $_ ; \
39+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys $_ ; \
4040
} \
4141
} ; \
4242
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
@@ -53,8 +53,8 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 as runner
5353
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
5454

5555
RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
56-
Write-Host ('Updating PATH: {0}' -f $newPath); \
57-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
56+
Write-Host ('Updating PATH: {0}' -f $newPath); \
57+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
5858

5959
COPY --from=installer C:/nodejs C:/nodejs
6060

@@ -63,6 +63,6 @@ ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
6363

6464
# Smoke test
6565
RUN node --version; \
66-
npm --version;
66+
npm --version;
6767

6868
CMD [ "node.exe" ]

‎22/windows-2022/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
44

55
# PATH isn't actually set in the Docker image, so we have to set it from within the container
66
RUN $newPath = ('C:\Program Files (x86)\GnuPG\bin;{0}' -f $env:PATH); \
7-
Write-Host ('Updating PATH: {0}' -f $newPath); \
8-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
7+
Write-Host ('Updating PATH: {0}' -f $newPath); \
8+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
99
# doing this first to share cache across versions more aggressively
1010

1111
ENV NODE_VERSION 22.8.0
1212
ENV NODE_CHECKSUM d6e1c4fca93997224cac0bec09b4201aa018f50171d38c6b85abe483012839c9
1313

14-
# Version and checksum of the GPG installer (Source: https://lists.gnupg.org/pipermail/gnupg-announce/2024q3/000484.html)
14+
# Version and checksum of the GPG installer (Source: https://www.gnupg.org/download/integrity_check.html)
1515
ENV GPG_VERSION 2.4.5_20240307
1616
ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc1
1717

@@ -34,9 +34,9 @@ RUN @( \
3434
'A363A499291CBBC940DD62E41F10027AF002F8B0', \
3535
'CC68F5A3106FF448322E48ED27F5E38D5B0A215F' \
3636
) | foreach { \
37-
gpg --batch --keyserver hkps://keys.openpgp.org --verbose --recv-keys $_ ; \
37+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
3838
if (-not $?) { \
39-
gpg --batch --keyserver keyserver.ubuntu.com --verbose --recv-keys $_ ; \
39+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys $_ ; \
4040
} \
4141
} ; \
4242
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
@@ -53,8 +53,8 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 as runner
5353
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
5454

5555
RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
56-
Write-Host ('Updating PATH: {0}' -f $newPath); \
57-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
56+
Write-Host ('Updating PATH: {0}' -f $newPath); \
57+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
5858

5959
COPY --from=installer C:/nodejs C:/nodejs
6060

@@ -63,6 +63,6 @@ ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
6363

6464
# Smoke test
6565
RUN node --version; \
66-
npm --version;
66+
npm --version;
6767

6868
CMD [ "node.exe" ]

‎Dockerfile-windows.template‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
44

55
# PATH isn't actually set in the Docker image, so we have to set it from within the container
66
RUN $newPath = ('C:\Program Files (x86)\GnuPG\bin;{0}' -f $env:PATH); \
7-
Write-Host ('Updating PATH: {0}' -f $newPath); \
8-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
7+
Write-Host ('Updating PATH: {0}' -f $newPath); \
8+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
99
# doing this first to share cache across versions more aggressively
1010

1111
ENV NODE_VERSION 0.0.0
1212
ENV NODE_CHECKSUM CHECKSUM_x64
1313

14-
# Version and checksum of the GPG installer (Source: https://lists.gnupg.org/pipermail/gnupg-announce/2024q3/000484.html)
14+
# Version and checksum of the GPG installer (Source: https://www.gnupg.org/download/integrity_check.html)
1515
ENV GPG_VERSION 2.4.5_20240307
1616
ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc1
1717

@@ -23,9 +23,9 @@ RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.e
2323
RUN @( \
2424
"${NODE_KEYS[@]}"
2525
) | foreach { \
26-
gpg --batch --keyserver hkps://keys.openpgp.org --verbose --recv-keys $_ ; \
26+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
2727
if (-not $?) { \
28-
gpg --batch --keyserver keyserver.ubuntu.com --verbose --recv-keys $_ ; \
28+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys $_ ; \
2929
} \
3030
} ; \
3131
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
@@ -42,8 +42,8 @@ FROM mcr.microsoft.com/windows/servercore:version as runner
4242
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
4343

4444
RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
45-
Write-Host ('Updating PATH: {0}' -f $newPath); \
46-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
45+
Write-Host ('Updating PATH: {0}' -f $newPath); \
46+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
4747

4848
COPY --from=installer C:/nodejs C:/nodejs
4949

@@ -52,6 +52,6 @@ ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
5252

5353
# Smoke test
5454
RUN node --version; \
55-
npm --version;
55+
npm --version;
5656

5757
CMD [ "node.exe" ]

0 commit comments

Comments
 (0)