Merge pull request #93 from docker/staging

Feng Honglin · web-flow · commit 704219e23430 · 2016-07-26T12:35:24.000+02:00
update base image; close #92
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.4
 MAINTAINER Feng Honglin <hfeng@tutum.co>
 
 COPY . /haproxy-src

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:edge`
	`1`	`+FROM alpine:3.4`
`2`	`2`	`MAINTAINER Feng Honglin <hfeng@tutum.co>`
`3`	`3`
`4`	`4`	`COPY . /haproxy-src`