From 1687f2cd90720b99eae271afa342a5d4dc17024c Mon Sep 17 00:00:00 2001 From: Joe Beaudry Date: Fri, 23 Mar 2018 13:50:43 -0400 Subject: [PATCH 1/3] Create dockerfile.1709 --- 3.2/windows/nanoserver/dockerfile.1709 | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 3.2/windows/nanoserver/dockerfile.1709 diff --git a/3.2/windows/nanoserver/dockerfile.1709 b/3.2/windows/nanoserver/dockerfile.1709 new file mode 100644 index 0000000..b338ce4 --- /dev/null +++ b/3.2/windows/nanoserver/dockerfile.1709 @@ -0,0 +1,42 @@ +```FROM microsoft/powershell:6.0.1-nanoserver-1709 + +USER ContainerAdministrator + +RUN setx /M PATH "%PATH%;%ProgramFiles%\PowerShell" +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('C:\Redis;{0}' -f $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ +# Nano Server does not have "[Environment]::SetEnvironmentVariable()" + setx /M PATH $newPath; +# doing this first to share cache across versions more aggressively + +ENV REDIS_VERSION 3.2.100 + +ADD https://github.com/MSOpenTech/redis/releases/download/win-${REDIS_VERSION }/Redis-x64-${REDIS_VERSION }.zip c:\redis.zip + +RUN Write-Host 'Expanding ...'; \ + Expand-Archive redis.zip -DestinationPath C:\Redis; \ + \ + Write-Host 'Verifying install ("redis-server --version") ...'; \ + redis-server --version; \ + \ + Write-Host 'Removing ...'; \ + Remove-Item redis.zip -Force + +# disable Redis protected mode [1] as it is unnecessary in context of Docker +# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P) +# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da +RUN (Get-Content C:\Redis\redis.windows.conf) \ + -Replace '^(bind)\s+.*$', '$1 0.0.0.0' \ + -Replace '^(protected-mode)\s+.*$', '$1 no' \ + | Set-Content C:\Redis\redis.docker.conf + +VOLUME C:\\data +WORKDIR C:\\data + + +EXPOSE 6379 +CMD ["redis-server.exe", "C:\\Redis\\redis.docker.conf"]``` From a494986d3eec1faf451b63646d8888752691995b Mon Sep 17 00:00:00 2001 From: Joe Beaudry Date: Fri, 23 Mar 2018 13:50:55 -0400 Subject: [PATCH 2/3] Rename dockerfile.1709 to Dockerfile.1709 --- 3.2/windows/nanoserver/{dockerfile.1709 => Dockerfile.1709} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 3.2/windows/nanoserver/{dockerfile.1709 => Dockerfile.1709} (100%) diff --git a/3.2/windows/nanoserver/dockerfile.1709 b/3.2/windows/nanoserver/Dockerfile.1709 similarity index 100% rename from 3.2/windows/nanoserver/dockerfile.1709 rename to 3.2/windows/nanoserver/Dockerfile.1709 From a2850ba0c8ebe416fc899e5f18841b1a3c26c561 Mon Sep 17 00:00:00 2001 From: Joe Beaudry Date: Fri, 23 Mar 2018 13:51:12 -0400 Subject: [PATCH 3/3] Update Dockerfile.1709 --- 3.2/windows/nanoserver/Dockerfile.1709 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.2/windows/nanoserver/Dockerfile.1709 b/3.2/windows/nanoserver/Dockerfile.1709 index b338ce4..024fa92 100644 --- a/3.2/windows/nanoserver/Dockerfile.1709 +++ b/3.2/windows/nanoserver/Dockerfile.1709 @@ -1,4 +1,4 @@ -```FROM microsoft/powershell:6.0.1-nanoserver-1709 +FROM microsoft/powershell:6.0.1-nanoserver-1709 USER ContainerAdministrator @@ -39,4 +39,4 @@ WORKDIR C:\\data EXPOSE 6379 -CMD ["redis-server.exe", "C:\\Redis\\redis.docker.conf"]``` +CMD ["redis-server.exe", "C:\\Redis\\redis.docker.conf"]