Improve multi-stage build

Author: StefanScherer

prometheus/Dockerfile

@@ -1,24 +1,29 @@
-FROM stefanscherer/chocolatey AS tar
-RUN choco install -y 7zip
+# escape=`
+FROM microsoft/windowsservercore AS tar
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+RUN Invoke-WebRequest 'http://www.7-zip.org/a/7z1604-x64.msi' -OutFile '7z.msi' -UseBasicParsing
+RUN Start-Process msiexec.exe -ArgumentList '/i', '7z.msi', '/quiet', '/norestart' -NoNewWindow -Wait
+
 ENV PROMETHEUS_VERSION 1.6.1
-RUN Invoke-WebRequest $('https://github.com/prometheus/prometheus/releases/download/v{0}/prometheus-{0}.windows-amd64.tar.gz' -f $env:PROMETHEUS_VERSION) -OutFile 'prometheus.tar.gz' -UseBasicParsing ; \
-    & 'C:\Program Files\7-Zip\7z.exe' x prometheus.tar.gz ; \
-    & 'C:\Program Files\7-Zip\7z.exe' x prometheus.tar ; \
-    Rename-Item -Path $('C:\prometheus-{0}.windows-amd64' -f $env:PROMETHEUS_VERSION) -NewName 'C:\download'
+
+RUN Invoke-WebRequest $('https://github.com/prometheus/prometheus/releases/download/v{0}/prometheus-{0}.windows-amd64.tar.gz' -f $env:PROMETHEUS_VERSION) -OutFile 'prometheus.tar.gz' -UseBasicParsing
+RUN & 'C:\Program Files\7-Zip\7z.exe' x prometheus.tar.gz
+RUN & 'C:\Program Files\7-Zip\7z.exe' x prometheus.tar
+RUN Rename-Item -Path $('C:\prometheus-{0}.windows-amd64' -f $env:PROMETHEUS_VERSION) -NewName 'C:\download'
 
 FROM microsoft/nanoserver
 
-COPY --from tar /download/prometheus.exe      /bin/prometheus.exe
-COPY --from tar /download/promtool.exe        /bin/promtool.exe
-COPY --from tar /download/prometheus.yml      /etc/prometheus/prometheus.yml
-COPY --from tar /download/console_libraries/  /etc/prometheus/
-COPY --from tar /download/consoles/           /etc/prometheus/
+COPY --from=tar /download/prometheus.exe      /bin/prometheus.exe
+COPY --from=tar /download/promtool.exe        /bin/promtool.exe
+COPY --from=tar /download/prometheus.yml      /etc/prometheus/prometheus.yml
+COPY --from=tar /download/console_libraries/  /etc/prometheus/
+COPY --from=tar /download/consoles/           /etc/prometheus/
 
 EXPOSE     9090
-VOLUME     [ "/prometheus" ]
-WORKDIR    /prometheus
+VOLUME     C:\prometheus
+WORKDIR    C:\prometheus
 ENTRYPOINT [ "C:\\bin\\prometheus.exe" ]
-CMD        [ "-config.file=/etc/prometheus/prometheus.yml", \
-             "-storage.local.path=/prometheus", \
-             "-web.console.libraries=/etc/prometheus/console_libraries", \
+CMD        [ "-config.file=/etc/prometheus/prometheus.yml", `
+             "-storage.local.path=/prometheus", `
+             "-web.console.libraries=/etc/prometheus/console_libraries", `
              "-web.console.templates=/etc/prometheus/consoles" ]

prometheus/push.ps1

@@ -1,4 +1,5 @@
-docker tag prometheus stefanscherer/prometheus-windows:1.6.1
+$version=$(select-string -Path Dockerfile -Pattern "ENV PROMETHEUS_VERSION").ToString().split()[-1]
+docker tag prometheus stefanscherer/prometheus-windows:$version
 docker tag prometheus stefanscherer/prometheus-windows:latest
-docker push stefanscherer/prometheus-windows:1.6.1
+docker push stefanscherer/prometheus-windows:$version
 docker push stefanscherer/prometheus-windows:latest

prometheus/test.ps1

@@ -1,3 +1,9 @@
-docker run -d -p 9090:9090 prometheus
-Start-Sleep 10
-docker logs $(docker ps -ql)
+docker run --name caddy -d -p 9090:9090 prometheus
+Start-Sleep -Seconds 5
+$req = Invoke-WebRequest http://$(docker inspect -f '{{ .NetworkSettings.Networks.nat.IPAddress }}' prometheus):9090/graph -UseBasicParsing
+$code = $req.statuscode
+$content = $req.content
+if($code -ne 200 -or !($content.Contains('prometheus.io'))){
+  throw "Prometheus test failed!"
+}
+docker logs prometheus