Skip to content

Commit 48e25c2

Browse files
zZHorizonZzzZHorizonZz
committed
Fix linting errors
1 parent b98f859 commit 48e25c2

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎22/windows-2019/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ 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
@@ -17,8 +17,8 @@ ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc
1717

1818
RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
1919
if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
20-
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
21-
gpg --version;
20+
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
21+
gpg --version;
2222

2323
RUN @( \
2424
'4ED778F539E3634C779C87C6D7062848A1AB005C', \
@@ -56,12 +56,12 @@ COPY --from=installer C:/nodejs C:/nodejs
5656
COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
5757

5858
RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
59-
Write-Host ('Updating PATH: {0}' -f $newPath); \
60-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); \
61-
# Because we need to use it in the current session
62-
$env:PATH = $newPath; \
63-
node --version; \
64-
npm --version;
59+
Write-Host ('Updating PATH: {0}' -f $newPath); \
60+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); \
61+
# Because we need to use it in the current session
62+
$env:PATH = $newPath; \
63+
node --version; \
64+
npm --version;
6565

6666
ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
6767

‎22/windows-2019/docker-entrypoint.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ $ErrorActionPreference = 'Stop'
55
# 1. Contains a "-"
66
# 2. Is NOT a recognized command
77
# 3. Is a file that's NOT executable
8-
if (($args[0] -like '*-') -or
8+
if (($args[0] -like '*-') -or
99
(!(Get-Command $args[0] -ErrorAction SilentlyContinue)) -or
10-
(((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) {
10+
(((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) {
1111
# Prepend 'node' to the argument list
1212
$args = @('node') + $args
1313
}
1414

1515
# Execute the (potentially modified) command
16-
& $args[0] $args[1..($args.Length-1)]
16+
& $args[0] $args[1..($args.Length-1)]

‎22/windows-2022/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ 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
@@ -17,8 +17,8 @@ ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc
1717

1818
RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
1919
if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
20-
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
21-
gpg --version;
20+
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
21+
gpg --version;
2222

2323
RUN @( \
2424
'4ED778F539E3634C779C87C6D7062848A1AB005C', \
@@ -56,12 +56,12 @@ COPY --from=installer C:/nodejs C:/nodejs
5656
COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
5757

5858
RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
59-
Write-Host ('Updating PATH: {0}' -f $newPath); \
60-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); \
61-
# Because we need to use it in the current session
62-
$env:PATH = $newPath; \
63-
node --version; \
64-
npm --version;
59+
Write-Host ('Updating PATH: {0}' -f $newPath); \
60+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); \
61+
# Because we need to use it in the current session
62+
$env:PATH = $newPath; \
63+
node --version; \
64+
npm --version;
6565

6666
ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
6767

‎22/windows-2022/docker-entrypoint.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ $ErrorActionPreference = 'Stop'
55
# 1. Contains a "-"
66
# 2. Is NOT a recognized command
77
# 3. Is a file that's NOT executable
8-
if (($args[0] -like '*-') -or
8+
if (($args[0] -like '*-') -or
99
(!(Get-Command $args[0] -ErrorAction SilentlyContinue)) -or
10-
(((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) {
10+
(((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) {
1111
# Prepend 'node' to the argument list
1212
$args = @('node') + $args
1313
}
1414

1515
# Execute the (potentially modified) command
16-
& $args[0] $args[1..($args.Length-1)]
16+
& $args[0] $args[1..($args.Length-1)]

‎Dockerfile-windows.template

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ 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
@@ -16,9 +16,9 @@ ENV GPG_VERSION 2.4.5_20240307
1616
ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc1
1717

1818
RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
19-
if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
20-
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
21-
gpg --version;
19+
if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
20+
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
21+
gpg --version;
2222

2323
RUN @( \
2424
"${NODE_KEYS[@]}"
@@ -45,12 +45,12 @@ COPY --from=installer C:/nodejs C:/nodejs
4545
COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
4646

4747
RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
48-
Write-Host ('Updating PATH: {0}' -f $newPath); \
49-
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); \
50-
# Because we need to use it in the current session
51-
$env:PATH = $newPath; \
52-
node --version; \
53-
npm --version;
48+
Write-Host ('Updating PATH: {0}' -f $newPath); \
49+
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); \
50+
# Because we need to use it in the current session
51+
$env:PATH = $newPath; \
52+
node --version; \
53+
npm --version;
5454

5555
ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
5656

‎architectures

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ arm32v7 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-sl
55
arm64v8 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
66
i386 alpine3.19,alpine3.20
77
ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
8-
s390x alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
8+
s390x alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim

‎docker-entrypoint.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ $ErrorActionPreference = 'Stop'
55
# 1. Contains a "-"
66
# 2. Is NOT a recognized command
77
# 3. Is a file that's NOT executable
8-
if (($args[0] -like '*-') -or
8+
if (($args[0] -like '*-') -or
99
(!(Get-Command $args[0] -ErrorAction SilentlyContinue)) -or
10-
(((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) {
10+
(((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) {
1111
# Prepend 'node' to the argument list
1212
$args = @('node') + $args
1313
}
1414

1515
# Execute the (potentially modified) command
16-
& $args[0] $args[1..($args.Length-1)]
16+
& $args[0] $args[1..($args.Length-1)]

0 commit comments

Comments
 (0)