From e53d1d4d071ca018826233d8c3c3d2e4747f2e34 Mon Sep 17 00:00:00 2001 From: J Schulz Date: Wed, 17 Nov 2021 21:43:10 -0500 Subject: [PATCH] Clarify hash alg, condense RUN commands, use single quotes where able. --- Dockerfile.windows | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 4a05054122..81fcedb910 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -61,14 +61,13 @@ RUN Write-Host ('Installing Visual C++ Redistributable Package'); ` # ADD https://slproweb.com/download/Win64OpenSSL-1_1_1L.msi /local/Win64OpenSSL-1_1_1L.msi -# Hash copied from https://github.com/slproweb/opensslhashes -RUN $ExpectedHash = \"1e62e6459835f61c418532a1544e295be5400498b3569aadfb6d0b5d7a1c1dbc\";` +# Verify SHA256 hash using expected value from https://github.com/slproweb/opensslhashes +RUN $ExpectedHash = '1e62e6459835f61c418532a1544e295be5400498b3569aadfb6d0b5d7a1c1dbc';` $ActualHash = $(Get-FileHash /local/Win64OpenSSL-1_1_1L.msi).Hash.ToLower();` if ($ActualHash -ne $ExpectedHash) {` throw \"OpenSSL hash mismatch. Expected: $ExpectedHash, Actual: $ActualHash\"` - }; - -RUN Start-Process msiexec.exe -Wait -ArgumentList '/i C:\local\Win64OpenSSL-1_1_1L.msi /quiet'; + };` + Start-Process msiexec.exe -Wait -ArgumentList '/i C:\local\Win64OpenSSL-1_1_1L.msi /quiet'; # # Install winflexbison