Merge pull request #113 from StefanScherer/update-registry-2.6.1

Update registry 2.6.1

Author: StefanScherer

registry/.gitignore

@@ -1,10 +1,36 @@
+FROM golang:1.8-nanoserver
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV DOCKER_BUILDTAGS include_oss include_gcs
+ENV DISTRIBUTION_VERSION v2.6.1
+
+ENV GIT_VERSION 2.11.0
+ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip
+
+RUN Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
+    Expand-Archive git.zip -DestinationPath C:\git; \
+    Remove-Item git.zip; \
+    Write-Host 'Updating PATH ...'; \
+    $env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
+    Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH
+
+RUN mkdir src\github.com\docker ; \
+    cd src\github.com\docker ; \
+    git clone -q https://github.com/docker/distribution ; \
+    cd distribution ; \
+    git checkout -q $env:DISTRIBUTION_VERSION ; \
+    try { go get github.com/tools/godep 2>&1 } catch { } ; \
+    try { go get github.com/tools/godep } catch { } ; \
+    Start-Process -FilePath godep.exe -ArgumentList go, build, ./cmd/registry -Wait
+
 FROM microsoft/nanoserver
 
-COPY ./registry.exe /registry.exe
+COPY --from=0 /gopath/src/github.com/docker/distribution/registry.exe /registry.exe
 COPY config.yml /config/config.yml
 
-# VOLUME ["/registry"]
-# EXPOSE 5000
+VOLUME C:\\registry
+EXPOSE 5000
 
 ENTRYPOINT ["\\registry.exe"]
 CMD ["serve", "/config/config.yml"]

registry/Dockerfile

@@ -2,36 +2,43 @@
 
 Run your own Docker Registry in a Windows Docker container.
 
-As with TP5 there is still a problem contacting containers from your Docker host locally (see [issue #253](https://github.com/Microsoft/Virtualization-Documentation/issues/253) for some details), I suggest to use two TP5 machines for now.
+As with Windows Server 2016 there is still a problem contacting containers from your Docker host locally (see [issue #253](https://github.com/Microsoft/Virtualization-Documentation/issues/253) for some details), I suggest to use two Windows Server 2016 machines for now.
 
 ## Create a folder on your host
 
-On the first TP5 we setup a local folder to persist your images.
+On the first Windows Server 2016 we setup a local folder to persist your images.
 
 ```
 mkdir C:\registry
 ```
 
 ## Run registry in container
 
-On the first TP5 machine run the registry like this:
+On the first Windows Server 2016 machine run the registry like this:
 
 ```
-docker run -d -p 5000:5000 --restart=always --name registry -v C:\registry:C:\registry stefanscherer/registry-windows:2.4.1
+docker run -d -p 5000:5000 --restart=always --name registry -v C:\registry:C:\registry stefanscherer/registry-windows:2.6.1
 ```
 
-## Edit your Docker Engine config filesystem
+## Edit your Docker Engine config file
 
-On the second TP5 machine add your local registry from the first TP5 machine. In this example the IP address of the first TP5 machine is 192.168.254.133.
+On the second Windows Server 2016 machine add your local registry from the first Windows Server 2016 machine. In this example the IP address of the first Windows Server 2016 machine is 192.168.254.133.
 
 ```
-notepad C:\ProgramData\docker\runDockerDaemon.cmd
+notepad C:\ProgramData\docker\config\daemon.json
 ```
 
-Add your Registry to the start command:
+```json
+{
+  "insecure-registries": [ "192.168.254.133:5000" ]
+}
+```
+
+Or add your Registry to the start command:
 
 ```
-dockerd -G docker -H npipe:// -H 0.0.0.0:2375 --insecure-registry 192.168.254.133:5000
+dockerd --unregister-service
+dockerd --register-service -G docker -H npipe:// --insecure-registry 192.168.254.133:5000
 ```
 
 ## Restart Docker Engine
@@ -43,15 +50,15 @@ restart-service docker
 ## Tag a Docker image
 
 ```
-docker tag stefanscherer/registry-windows:2.4.1 192.168.254.133:5000/registry:2.4.1
+docker tag stefanscherer/registry-windows:2.6.1 192.168.254.133:5000/registry:2.6.1
 ```
 
 ## Push a Docker image
 
 ```
-docker push 192.168.254.133:5000/registry:2.4.1
+docker push 192.168.254.133:5000/registry:2.6.1
 ```
 
 ## Check C:\registry
 
-On the first TP5 machine check the `C:\registry` folder and you will see some directories and files containing the images and meta information.
+On the first Windows Server 2016 machine check the `C:\registry` folder and you will see some directories and files containing the images and meta information.

registry/README.md

@@ -1,8 +1,11 @@
-echo Building registry binary
-docker build -t registry-builder build
-docker create --name registry-builder registry-builder
-docker cp registry-builder:/gopath/src/github.com/docker/distribution/registry.exe ./registry.exe
+Write-Host Updating Docker engine to master
+Stop-Service docker
+$wc = New-Object net.webclient
+$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/dockerd.exe", "$env:ProgramFiles\docker\dockerd.exe")
+$wc.Downloadfile("https://master.dockerproject.org/windows/amd64/docker.exe", "$env:ProgramFiles\docker\docker.exe")
+Start-Service docker
+docker version
 
-echo Building registry image
+Write-Host Building registry binary and image
 docker build -t registry .
-docker tag registry:latest registry:2.6.0
+docker tag registry:latest registry:2.6.1

registry/build.ps1

@@ -1,4 +1,4 @@
-docker tag registry:2.6.0 stefanscherer/registry-windows:2.6.0
-docker tag registry:2.6.0 stefanscherer/registry-windows:latest
-docker push stefanscherer/registry-windows:2.6.0
+docker tag registry:2.6.1 stefanscherer/registry-windows:2.6.1
+docker tag registry:2.6.1 stefanscherer/registry-windows:latest
+docker push stefanscherer/registry-windows:2.6.1
 docker push stefanscherer/registry-windows:latest

registry/build/Dockerfile

@@ -0,0 +1,36 @@
+$ErrorActionPreference = 'Stop'
+
+function addRegistryToDaemonJson() {
+  Write-Host "Adding registry"
+  $daemonJson = "$env:ProgramData\docker\config\daemon.json"
+  $config = @{}
+  if (Test-Path $daemonJson) {
+    $config = (Get-Content $daemonJson) -join "`n" | ConvertFrom-Json
+  }
+  $config = $config | Add-Member(@{ `
+    'insecure-registries' = @("127.0.0.1:5000"); `
+  }) -Force -PassThru
+  $config | ConvertTo-Json | Set-Content $daemonJson -Encoding Ascii
+}
+
+function addPortMapping() {
+  netsh interface portproxy add v4tov4 listenport=5000 listenaddress=127.0.0.1 connectport=5000 connectaddress=$(docker inspect -f '{{ .NetworkSettings.Networks.nat.IPAddress }}' registry)
+}
+
+function runRegistry() {
+  mkdir C:\registry
+  docker run -d -p 5000:5000 --restart=always --name registry -v C:\registry:C:\registry registry:2.6.1
+}
+
+
+addRegistryToDaemonJson
+restart-service docker
+runRegistry
+addPortMapping
+
+Write-Host Pushing an image to local registry
+docker tag registry:2.6.1 127.0.0.1:5000/registry:2.6.1
+docker push 127.0.0.1:5000/registry:2.6.1
+
+Write-Host Checking if local registry files are stored on host
+dir C:\registry\docker\registry\v2\repositories\registry\