From abcdc9ecd310093a0ff0e61a7b211b5a191c3a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20B=C3=B6hm?= <philipp@pboehm.org>
Date: Sun, 2 Jul 2017 23:08:36 +0200
Subject: [PATCH] fix ddns build

---
 docker/ddns/Dockerfile    | 8 +++++++-
 docker/docker-compose.yml | 2 +-
 docker/powerdns/pdns.conf | 3 ++-
 docker/web/Dockerfile     | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker/ddns/Dockerfile b/docker/ddns/Dockerfile
index 936e5fd..2b2bfaa 100644
--- a/docker/ddns/Dockerfile
+++ b/docker/ddns/Dockerfile
@@ -1,3 +1,9 @@
-FROM golang:1.7-onbuild
+FROM golang:1.7
+
+WORKDIR /go/src/github.com/pboehm/ddns
+COPY . .
+
+RUN go-wrapper download   # "go get -d -v ./..."
+RUN go-wrapper install    # "go install -v ."
 
 CMD ["/bin/true"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index de8e4aa..e6d1295 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,7 +5,7 @@ volumes:
 
 services:
   ddns:
-    restart: unless-stopped
+    restart: no
     build:
       context: ..
       dockerfile: docker/ddns/Dockerfile
diff --git a/docker/powerdns/pdns.conf b/docker/powerdns/pdns.conf
index 5e209f9..367baa3 100644
--- a/docker/powerdns/pdns.conf
+++ b/docker/powerdns/pdns.conf
@@ -3,6 +3,7 @@ cache-ttl=0
 loglevel=7
 log-dns-details=yes
 disable-axfr=yes
+pipe-abi-version=1
 
 launch=pipe
-pipe-command=/go/bin/app --domain={{DDNS_DOMAIN}} --soa_fqdn={{DDNS_SOA_DOMAIN}} --redis=redis:6379 {{DDNS_VERBOSE}} backend
\ No newline at end of file
+pipe-command=/go/bin/ddns --domain={{DDNS_DOMAIN}} --soa_fqdn={{DDNS_SOA_DOMAIN}} --redis=redis:6379 {{DDNS_VERBOSE}} backend
\ No newline at end of file
diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
index 8c4e53c..9ec1003 100644
--- a/docker/web/Dockerfile
+++ b/docker/web/Dockerfile
@@ -3,4 +3,4 @@ MAINTAINER Philipp Böhm <philipp@pboehm.org>
 
 ENV GIN_MODE release
 
-CMD /go/bin/app --domain=${DDNS_DOMAIN} --redis=redis:6379 web
+CMD /go/bin/ddns --domain=${DDNS_DOMAIN} --redis=redis:6379 web