From 28bf366c700cb1515b812ab0bebae9b15de2fce1 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sun, 21 Jan 2018 12:58:52 -0800
Subject: [PATCH] mage: streamline dockerfiles

---
 Dockerfile.core => Dockerfile              | 7 +++++--
 Dockerfile.agent                           | 6 ------
 mage.go                                    | 9 ++++++---
 run/Dockerfile.agent                       | 6 ++++++
 Dockerfile.routed => run/Dockerfile.routed | 2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)
 rename Dockerfile.core => Dockerfile (55%)
 delete mode 100644 Dockerfile.agent
 create mode 100644 run/Dockerfile.agent
 rename Dockerfile.routed => run/Dockerfile.routed (54%)

diff --git a/Dockerfile.core b/Dockerfile
similarity index 55%
rename from Dockerfile.core
rename to Dockerfile
index fc76e06..9dcb1e6 100644
--- a/Dockerfile.core
+++ b/Dockerfile
@@ -1,9 +1,12 @@
 FROM xena/go-mini:1.9.2
 
-RUN apk add alpine-sdk \
+ENV CGO_ENABLED=0
+
+RUN apk add git \
  && go download
 
 COPY . /root/go/src/git.xeserv.us/xena/route
 
 RUN cd /root/go/src/git.xeserv.us/xena/route \
-&& go run ./cmd/mage/main.go build
+&& go run ./cmd/mage/main.go build \
+&& rm -rf /root/go/pkg /root/go/bin
diff --git a/Dockerfile.agent b/Dockerfile.agent
deleted file mode 100644
index 374bade..0000000
--- a/Dockerfile.agent
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM xena/route-core
-FROM xena/alpine
-
-COPY --from=0 /root/go/bin/route-httpagent /usr/local/bin/route-httpagent
-
-CMD /usr/local/bin/route-httpagent
diff --git a/mage.go b/mage.go
index a0669b1..7bb9f60 100644
--- a/mage.go
+++ b/mage.go
@@ -73,9 +73,12 @@ func Docker() {
 	ver, err := gitTag()
 	qod.ANE(err)
 
-	shouldWork(ctx, nil, wd, "docker", "build", "-t", "xena/route-core", "-f", "Dockerfile.core", ".")
-	shouldWork(ctx, nil, wd, "docker", "build", "-t", "xena/routed:"+ver, "-f", "Dockerfile.routed", ".")
-	shouldWork(ctx, nil, wd, "docker", "build", "-t", "xena/route-httpagent:"+ver, "-f", "Dockerfile.agent", ".")
+	shouldWork(ctx, nil, wd, "docker", "build", "-t", "xena/route-core", ".")
+
+	run := filepath.Join(wd, "run")
+
+	shouldWork(ctx, nil, run, "docker", "build", "-t", "xena/routed:"+ver, "-f", "Dockerfile.routed", ".")
+	shouldWork(ctx, nil, run, "docker", "build", "-t", "xena/route-httpagent:"+ver, "-f", "Dockerfile.agent", ".")
 }
 
 // Linux builds binaries for linux
diff --git a/run/Dockerfile.agent b/run/Dockerfile.agent
new file mode 100644
index 0000000..ee5f7f4
--- /dev/null
+++ b/run/Dockerfile.agent
@@ -0,0 +1,6 @@
+FROM xena/route-core
+FROM xena/alpine
+
+COPY --from=0 /root/go/src/git.xeserv.us/xena/route/bin/linux/amd64/route-httpagent /usr/local/bin/route-httpagent
+
+CMD /usr/local/bin/route-httpagent
diff --git a/Dockerfile.routed b/run/Dockerfile.routed
similarity index 54%
rename from Dockerfile.routed
rename to run/Dockerfile.routed
index 030f2e8..82e77a4 100644
--- a/Dockerfile.routed
+++ b/run/Dockerfile.routed
@@ -1,7 +1,7 @@
 FROM xena/route-core
 FROM xena/alpine
 
-COPY --from=0 /root/go/bin/routed /usr/local/bin/routed
+COPY --from=0 /root/go/src/git.xeserv.us/xena/route/bin/linux/amd64/routed /usr/local/bin/routed
 
 VOLUME /routed