From eb692031824254fa38b069d16f5df4a838858c3e Mon Sep 17 00:00:00 2001
From: parauliya <aman@infracloud.io>
Date: Fri, 31 Jan 2020 15:55:51 +0530
Subject: [PATCH] Changes in rover to cross compile rover

---
 .gitignore              |  2 --
 Dockerfile              |  2 +-
 Makefile                | 18 +++++++++++-------
 cmd/rover/Dockerfile    |  2 +-
 docker-compose.yml      |  3 ++-
 test-docker-compose.yml |  3 ++-
 worker/Dockerfile       |  4 ++--
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e43eea4b..0c8869162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 /rover
 bin/
 certs/
-rover-linux-x86_64
-rover-worker-linux-x86_64
 
diff --git a/Dockerfile b/Dockerfile
index de6ec11e3..63af14b90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,4 +8,4 @@ RUN apk add --no-cache --update --upgrade ca-certificates postgresql-client
 RUN apk add --no-cache --update --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing cfssl
 COPY deploy/migrate /migrate
 COPY deploy/docker-entrypoint-initdb.d/rover-init.sql /init.sql
-COPY rover-linux-x86_64 /rover
+COPY bin/rover-server /rover
diff --git a/Makefile b/Makefile
index 21a803ac9..f8e8962c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
-server := rover-linux-x86_64
-cli := cmd/rover/rover-linux-x86_64
-worker := worker/rover-worker-linux-x86_64
-binaries := ${server} ${cli} ${worker}
+bindir := bin
+server := ${bindir}/rover-server
+cli := ${bindir}/rover-cli
+worker := ${bindir}/rover-worker
+binaries := ${bindir} ${server} ${cli} ${worker}
 all: ${binaries}
 
 .PHONY: server ${binaries} cli worker test
@@ -9,14 +10,17 @@ server: ${server}
 cli: ${cli}
 worker : ${worker}
 
+${bindir}:
+	mkdir -p $@/
+
 ${server}:
-	CGO_ENABLED=0 GOOS=linux go build -o $@ ./$(@D)
+	CGO_ENABLED=0 go build -o $@ .
 
 ${cli}:
-	CGO_ENABLED=0 GOOS=linux go build -o $@ ./$(@D)
+	CGO_ENABLED=0 go build -o $@ ./cmd/rover
 
 ${worker}:
-	CGO_ENABLED=0 GOOS=linux go build -o $@ ./$(@D)
+	CGO_ENABLED=0 go build -o $@ ./worker/
 
 run: ${binaries}
 	docker-compose up -d --build db
diff --git a/cmd/rover/Dockerfile b/cmd/rover/Dockerfile
index d8d487587..55dc112b9 100644
--- a/cmd/rover/Dockerfile
+++ b/cmd/rover/Dockerfile
@@ -3,5 +3,5 @@ FROM alpine:3.7
 CMD sleep 60d
 
 RUN apk add --no-cache --update --upgrade ca-certificates
-COPY rover-linux-x86_64 /bin/rover
+COPY bin/rover-cli /bin/rover
 COPY sample.tmpl /tmp
diff --git a/docker-compose.yml b/docker-compose.yml
index c834585c7..220531248 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,7 +61,8 @@ services:
 
   cli:
     build:
-      context: cmd/rover
+      context: .
+      dockerfile: cmd/rover/Dockerfile
     environment:
       ROVER_GRPC_AUTHORITY: 127.0.0.1:42113
       ROVER_CERT_URL: http://127.0.0.1:42114/cert
diff --git a/test-docker-compose.yml b/test-docker-compose.yml
index f59bfbd29..bf841b7f4 100644
--- a/test-docker-compose.yml
+++ b/test-docker-compose.yml
@@ -65,7 +65,8 @@ services:
 
   cli:
     build:
-      context: cmd/rover
+      context: .
+      dockerfile: cmd/rover/Dockerfile
     environment:
       ROVER_GRPC_AUTHORITY: 127.0.0.1:42113
       ROVER_CERT_URL: http://127.0.0.1:42114/cert
diff --git a/worker/Dockerfile b/worker/Dockerfile
index b8e353f7f..9ca800fa4 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.10
 
 RUN apk add --no-cache --update --upgrade ca-certificates
-COPY rover-worker-linux-x86_64 /bin/worker
-ENTRYPOINT [ "/bin/worker" ]
\ No newline at end of file
+COPY bin/rover-worker /bin/worker
+ENTRYPOINT [ "/bin/worker" ]