Merge branch 'master' into edge

Dockerfile: Follow Alpine Linux 'edge' branch
This git branch will follow the Alpine edge branch. Related #267
2017-07-08 11:08:57 -07:00 · 2017-05-26 12:39:10 -07:00
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 # Original credit: https://github.com/jpetazzo/dockvpn

 # Smallest base image
-FROM alpine:latest
+FROM alpine:edge

 MAINTAINER Kyle Manna <kyle@kylemanna.com>
Author	SHA1	Message	Date
Kyle Manna	9b9ba57ea0	Merge branch 'master' into edge	2017-07-08 11:08:57 -07:00
Kyle Manna	9d730e166e	Dockerfile: Follow Alpine Linux 'edge' branch This git branch will follow the Alpine edge branch. Related #267	2017-05-26 12:39:10 -07:00