Merge pull request #12 from film42/gt/some_stugg

Upgrade to go 1.11 and use multi-stage docker container from scratch

Dockerfile

@@ -1,6 +1,10 @@
-FROM golang:1.8.1-alpine
+FROM golang:1.11-alpine as builder
 ADD . /turbulence
 WORKDIR /turbulence
 ENV GOPATH /turbulence
-RUN go build
-ENTRYPOINT ["/turbulence/turbulence"]
+RUN CGO_ENABLED=0 go build
+
+FROM scratch
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /turbulence/turbulence /
+ENTRYPOINT ["/turbulence"]

README.md

@@ -14,10 +14,16 @@ $ go get github.com/film42/turbulence
 $ ./bin/turbulence
 ```
 
-Or you can grab the pre-built docker container:
+Or you can grab the pre-built docker container with default options:
 
 ```
-$ docker run -p 26000:26000 -d film42/turbulence:latest --config test/config.json
+$ docker run -p 25000:25000 -d film42/turbulence:latest
+```
+
+Or use your own config:
+
+```
+$ docker run -p 26000:26000 -d -v $(pwd)/test:/config film42/turbulence:latest --config config/config.json
 ```
 
 ### Configuring

connection.go

@@ -103,9 +103,9 @@ func (c *connection) Handle() {
 	logger.Info.Println(c.id, "Processing connection to:", request.Method, request.Host)
 
 	if request.Method == "CONNECT" {
-		c.proxy = &httpsProxy{}
+		c.proxy = new(httpsProxy)
 	} else {
-		c.proxy = &httpProxy{}
+		c.proxy = new(httpProxy)
 	}
 
 	err = c.proxy.SetupOutgoing(c, request)