Merge pull request #85 from StefanScherer/customize-port

webserver: Customize port

Author: StefanScherer

webserver/Dockerfile

@@ -2,4 +2,6 @@ FROM microsoft/nanoserver
 
 COPY tmp /
 
+EXPOSE 8080
+
 CMD ["\\webserver.exe"]

webserver/README.md

@@ -46,5 +46,9 @@ start http://$(docker inspect -f '{{ .NetworkSettings.Networks.nat.IPAddress }}'
 
 or use the IP address of your Docker host if accessing from a remote machine.
 
+### Change the port
+
+The webserver application is listenting on port 8080. You can modify that by setting the environment variable `PORT` to another port number.
+
 ## License
 MIT

webserver/build.sh webserver/build.batwebserver/build.sh renamed to webserver/build.bat

@@ -1,8 +1,6 @@
-#!/bin/bash
 docker build -t webserverbuild -f Dockerfile.build .
-docker rm -f webserverbuild
 docker create --name webserverbuild webserverbuild
-rm -rf tmp
 mkdir tmp
 docker cp webserverbuild:/code/webserver.exe tmp
 docker build -t webserver .
+docker tag webserver:latest webserver:0.2.0

webserver/push.bat

@@ -0,0 +1,4 @@
+docker tag webserver:0.2.0 stefanscherer/webserver-windows:0.2.0 || exit /b
+docker tag webserver:0.2.0 stefanscherer/webserver-windows:latest || exit /b
+docker push stefanscherer/webserver-windows:0.2.0
+docker push stefanscherer/webserver-windows:latest

webserver/test.bat

@@ -0,0 +1,3 @@
+docker run --name webserver -p 8080:8080 -d webserver:0.2.0
+ping 127.0.0.1 -n 6 > nul
+docker logs webserver

webserver/webserver

@@ -1,7 +1,16 @@
 package main
 
-import "net/http"
+import (
+	"fmt"
+	"net/http"
+	"os"
+)
 
 func main() {
-	panic(http.ListenAndServe(":8080", http.FileServer(http.Dir("."))))
+	port := os.Getenv("PORT")
+	if port == "" {
+		port = "8080"
+	}
+	fmt.Println("Proudly serving content on port", port)
+	panic(http.ListenAndServe(fmt.Sprintf(":%s", port), http.FileServer(http.Dir("."))))
 }