diff --git a/Dockerfile b/Dockerfile index 8c84167..cf46baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,9 @@ RUN set -eux; \ curl --fail --silent --show-error --location \ "https://nodejs.org/dist/v${NODE_VERSION}/SHASUMS256.txt" \ --output /tmp/SHASUMS256.txt; \ - grep -F " node-v${NODE_VERSION}-linux-${node_arch}.tar.xz" /tmp/SHASUMS256.txt | sha256sum --check --status -; \ + grep -F " node-v${NODE_VERSION}-linux-${node_arch}.tar.xz" /tmp/SHASUMS256.txt | \ + sed "s# node-v${NODE_VERSION}-linux-${node_arch}.tar.xz# /tmp/node.tar.xz#" | \ + sha256sum --check --status -; \ tar --extract --file /tmp/node.tar.xz --directory /usr/local --strip-components=1; \ rm -f /tmp/node.tar.xz /tmp/SHASUMS256.txt; \ apt-get purge -y --auto-remove curl xz-utils; \ diff --git a/scripts/m0-smoke.ps1 b/scripts/m0-smoke.ps1 index 5f0cb36..c8be4de 100644 --- a/scripts/m0-smoke.ps1 +++ b/scripts/m0-smoke.ps1 @@ -43,7 +43,7 @@ function Invoke-Compose { $exitCode = $LASTEXITCODE if ($exitCode -ne 0) { $renderedArguments = $commandArguments -join ' ' - throw "Docker Compose command failed with exit code \${exitCode}: docker $renderedArguments" + throw "Docker Compose command failed with exit code ${exitCode}: docker $renderedArguments" } } @@ -63,7 +63,7 @@ function Get-ComposeOutput { $exitCode = $LASTEXITCODE if ($exitCode -ne 0) { $renderedArguments = $commandArguments -join ' ' - throw "Docker Compose command failed with exit code \${exitCode}: docker $renderedArguments" + throw "Docker Compose command failed with exit code ${exitCode}: docker $renderedArguments" } return @($output) }