Merge pull request #3 from blinkreaction/develop

Release v1.1.0
docksal · Jun 7, 2016 · 125649d · 125649d
2 parents 660ec46 + 350c2bf
commit 125649d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.2
+FROM alpine:3.3
 
 MAINTAINER Leonid Makarov <leonid.makarov@blinkreaction.com>
 
@@ -10,7 +10,7 @@ RUN apk add --update \
 	&& rm -rf /var/cache/apk/*
 
 # Install docker-gen
-ENV DOCKER_GEN_VERSION 0.4.1
+ENV DOCKER_GEN_VERSION 0.7.1
 RUN wget https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-i386-$DOCKER_GEN_VERSION.tar.gz && \
 	tar -C /usr/local/bin -xvzf docker-gen-linux-i386-$DOCKER_GEN_VERSION.tar.gz && \
 	rm /docker-gen-linux-i386-$DOCKER_GEN_VERSION.tar.gz

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Docker Service Discovery using docker-gen and dnsmasq
 docker-gen generates a configuration for Dnsmasq and reloads it when containers are
 started and stopped.
 
-This is a fork of [dsn-gen](https://github.com/jderusse/docker-dns-gen) 
+This is a fork of [dns-gen](https://github.com/jderusse/docker-dns-gen) 
 refactored to work with the Alpine Linux base image.
 
-See [dsn-gen](https://github.com/jderusse/docker-dns-gen) repo for detailed instructions.
+See [dns-gen](https://github.com/jderusse/docker-dns-gen) repo for detailed instructions.