Fix some minor bugs in update.sh and add windowsservercore variants for 1.5 and 1.7 #108

tianon · 2016-08-12T19:12:29Z

Expanding on #106 👍

tianon · 2016-08-12T19:14:40Z

commit 5064128550ac4d68f8f46a69bac6c84e329efb2e
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Aug 12 12:12:03 2016 -0700

    Fix some minor bugs in update.sh and add windowsservercore variants for 1.5 and 1.7

diff --git a/1.6/windows/windowsservercore/Dockerfile b/1.5/windows/windowsservercore/Dockerfile
similarity index 91%
copy from 1.6/windows/windowsservercore/Dockerfile
copy to 1.5/windows/windowsservercore/Dockerfile
index 8d33a33..229c696 100644
--- a/1.6/windows/windowsservercore/Dockerfile
+++ b/1.5/windows/windowsservercore/Dockerfile
@@ -13,6 +13,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
    \
    Write-Host ('Verifying sha256 ({0}) ...' -f $env:GIT_DOWNLOAD_SHA256); \
    if ((Get-FileHash git.exe -Algorithm sha256).Hash -ne $env:GIT_DOWNLOAD_SHA256) { \
+       Write-Host 'FAILED!'; \
        exit 1; \
    }; \
    \
@@ -51,21 +52,25 @@ ENV GOPATH C:\\gopath
 RUN [Environment]::SetEnvironmentVariable('PATH', $env:GOPATH + '\bin;C:\go\bin;' + $env:PATH, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively

-ENV GOLANG_VERSION 1.6.3
+ENV GOLANG_VERSION 1.5.4
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.zip
-ENV GOLANG_DOWNLOAD_SHA256 6a18e5ed8b39785338986aecc6a3f36f5c4be286ff52db0ae3bcd2275ab70df0
+ENV GOLANG_DOWNLOAD_SHA256 1201053d5659a5fc5c82dff58c3eaee66ecd02901621725cfdfff1681278bd1a

 RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
    (New-Object System.Net.WebClient).DownloadFile($env:GOLANG_DOWNLOAD_URL, 'go.zip'); \
    \
    Write-Host ('Verifying sha256 ({0}) ...' -f $env:GOLANG_DOWNLOAD_SHA256); \
    if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $env:GOLANG_DOWNLOAD_SHA256) { \
+       Write-Host 'FAILED!'; \
        exit 1; \
    }; \
    \
    Write-Host 'Expanding ...'; \
    Expand-Archive go.zip -DestinationPath C:\; \
    \
+   Write-Host 'Verifying install ("go version") ...'; \
+   go version; \
+   \
    Write-Host 'Removing ...'; \
    Remove-Item go.zip -Force; \
    \
diff --git a/1.6/windows/windowsservercore/Dockerfile b/1.6/windows/windowsservercore/Dockerfile
index 8d33a33..1b241fa 100644
--- a/1.6/windows/windowsservercore/Dockerfile
+++ b/1.6/windows/windowsservercore/Dockerfile
@@ -13,6 +13,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
    \
    Write-Host ('Verifying sha256 ({0}) ...' -f $env:GIT_DOWNLOAD_SHA256); \
    if ((Get-FileHash git.exe -Algorithm sha256).Hash -ne $env:GIT_DOWNLOAD_SHA256) { \
+       Write-Host 'FAILED!'; \
        exit 1; \
    }; \
    \
@@ -60,12 +61,16 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
    \
    Write-Host ('Verifying sha256 ({0}) ...' -f $env:GOLANG_DOWNLOAD_SHA256); \
    if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $env:GOLANG_DOWNLOAD_SHA256) { \
+       Write-Host 'FAILED!'; \
        exit 1; \
    }; \
    \
    Write-Host 'Expanding ...'; \
    Expand-Archive go.zip -DestinationPath C:\; \
    \
+   Write-Host 'Verifying install ("go version") ...'; \
+   go version; \
+   \
    Write-Host 'Removing ...'; \
    Remove-Item go.zip -Force; \
    \
diff --git a/1.6/windows/windowsservercore/Dockerfile b/1.7/windows/windowsservercore/Dockerfile
similarity index 91%
copy from 1.6/windows/windowsservercore/Dockerfile
copy to 1.7/windows/windowsservercore/Dockerfile
index 8d33a33..f0f19ce 100644
--- a/1.6/windows/windowsservercore/Dockerfile
+++ b/1.7/windows/windowsservercore/Dockerfile
@@ -13,6 +13,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:GIT_DOWNLOAD_URL); \
    \
    Write-Host ('Verifying sha256 ({0}) ...' -f $env:GIT_DOWNLOAD_SHA256); \
    if ((Get-FileHash git.exe -Algorithm sha256).Hash -ne $env:GIT_DOWNLOAD_SHA256) { \
+       Write-Host 'FAILED!'; \
        exit 1; \
    }; \
    \
@@ -51,21 +52,25 @@ ENV GOPATH C:\\gopath
 RUN [Environment]::SetEnvironmentVariable('PATH', $env:GOPATH + '\bin;C:\go\bin;' + $env:PATH, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively

-ENV GOLANG_VERSION 1.6.3
+ENV GOLANG_VERSION 1.7rc6
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.zip
-ENV GOLANG_DOWNLOAD_SHA256 6a18e5ed8b39785338986aecc6a3f36f5c4be286ff52db0ae3bcd2275ab70df0
+ENV GOLANG_DOWNLOAD_SHA256 f043f7327049340e078ded4f9eed0b811f8cfa1adb7492403d3dea9cfebee13b

 RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
    (New-Object System.Net.WebClient).DownloadFile($env:GOLANG_DOWNLOAD_URL, 'go.zip'); \
    \
    Write-Host ('Verifying sha256 ({0}) ...' -f $env:GOLANG_DOWNLOAD_SHA256); \
    if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $env:GOLANG_DOWNLOAD_SHA256) { \
+       Write-Host 'FAILED!'; \
        exit 1; \
    }; \
    \
    Write-Host 'Expanding ...'; \
    Expand-Archive go.zip -DestinationPath C:\; \
    \
+   Write-Host 'Verifying install ("go version") ...'; \
+   go version; \
+   \
    Write-Host 'Removing ...'; \
    Remove-Item go.zip -Force; \
    \
diff --git a/update.sh b/update.sh
index fe61311..58f3c53 100755
--- a/update.sh
+++ b/update.sh
@@ -40,12 +40,13 @@ for version in "${versions[@]}"; do
    [[ "$versionTag" == *.*[^0-9]* ]] || versionTag+='.0'
    (
        set -x
-       sed -ri '
-           s/^(ENV GOLANG_VERSION) .*/\1 '"$fullVersion"'/;
-           s/^(ENV GOLANG_DOWNLOAD_SHA256) .*/\1 '"$linuxSha256"'/;
-           s/^(ENV GOLANG_SRC_SHA256) .*/\1 '"$srcSha256"'/;
-           s/^(FROM golang):.*/\1:'"$version"'/;
-       ' "$version/Dockerfile" "$version/"*"/Dockerfile"
+       sed -ri \
+           -e 's/^(ENV GOLANG_VERSION) .*/\1 '"$fullVersion"'/' \
+           -e 's/^(ENV GOLANG_DOWNLOAD_SHA256) .*/\1 '"$linuxSha256"'/' \
+           -e 's/^(ENV GOLANG_SRC_SHA256) .*/\1 '"$srcSha256"'/' \
+           -e 's/^(FROM golang):.*/\1:'"$version"'/' \
+           "$version/Dockerfile" \
+           "$version/"*"/Dockerfile"
        cp go-wrapper "$version/"
    )
    for variant in alpine wheezy; do
@@ -64,7 +65,10 @@ for version in "${versions[@]}"; do
        if [ -d "$version/$variant" ]; then
            (
                set -x
-               sed -ri 's/^(ENV GOLANG_DOWNLOAD_SHA256) .*/\1 '"$windowsSha256"'/' "$version/$variant/Dockerfile"
+               sed -ri \
+                   -e 's/^(ENV GOLANG_VERSION) .*/\1 '"$fullVersion"'/' \
+                   -e 's/^(ENV GOLANG_DOWNLOAD_SHA256) .*/\1 '"$windowsSha256"'/' \
+                   "$version/$variant/Dockerfile"
            )
        fi
    done

tianon · 2016-08-12T22:34:23Z

1.6/windows/windowsservercore/Dockerfile

@@ -8,37 +8,41 @@ ENV GIT_TAG v${GIT_VERSION}.windows.1
 ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/${GIT_TAG}/Git-${GIT_VERSION}-64-bit.exe
 ENV GIT_DOWNLOAD_SHA256 006d971bcbe73cc8d841a100a4eb20d22e135142bf5b0f2120722fd420e166e5
 # steps inspired by "chcolateyInstall.ps1" from "git.install" (https://chocolatey.org/packages/git.install)
+# see https://disqus.com/home/discussion/chocolatey/chocolatey_gallery_git_install_1710/#comment-2834659433 for why we don't use "/LOADINF=..." to let the installer set PATH


…or 1.5 and 1.7

yosifkit · 2016-08-12T23:34:51Z

LGTM

tianon force-pushed the moar-windows branch 3 times, most recently from feceb0d to 224f2fc Compare August 12, 2016 22:33

tianon reviewed Aug 12, 2016
View reviewed changes

tianon force-pushed the moar-windows branch 2 times, most recently from 5d6976e to d8bf13c Compare August 12, 2016 22:42

Fix some minor bugs in update.sh and add windowsservercore variants f…

8376071

…or 1.5 and 1.7

tianon force-pushed the moar-windows branch from d8bf13c to 8376071 Compare August 12, 2016 22:57

yosifkit merged commit 04ba8bf into docker-library:master Aug 12, 2016

yosifkit deleted the moar-windows branch August 12, 2016 23:34

tianon mentioned this pull request Aug 12, 2016

Update golang to add "windowsservercore" variants docker-library/official-images#2052

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix some minor bugs in update.sh and add windowsservercore variants for 1.5 and 1.7 #108

Fix some minor bugs in update.sh and add windowsservercore variants for 1.5 and 1.7 #108

Uh oh!

tianon commented Aug 12, 2016 •

edited

Loading

Uh oh!

tianon commented Aug 12, 2016 •

edited

Loading

Uh oh!

tianon Aug 12, 2016

Uh oh!

yosifkit commented Aug 12, 2016

Uh oh!

Uh oh!

Fix some minor bugs in update.sh and add windowsservercore variants for 1.5 and 1.7 #108

Fix some minor bugs in update.sh and add windowsservercore variants for 1.5 and 1.7 #108

Uh oh!

Conversation

tianon commented Aug 12, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tianon commented Aug 12, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tianon Aug 12, 2016

Choose a reason for hiding this comment

Uh oh!

yosifkit commented Aug 12, 2016

Uh oh!

Uh oh!

tianon commented Aug 12, 2016 •

edited

Loading

tianon commented Aug 12, 2016 •

edited

Loading