Merge branch 'docker-autobuild'

elwinar · Jun 5, 2018 · ce8928d · ce8928d
2 parents cff75ff + 8f92117
commit ce8928d
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 116 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,10 @@
+FROM golang
+COPY . /go/src/github.com/elwinar/rambler
+WORKDIR /go/src/github.com/elwinar/rambler
+RUN go get ./...
+RUN go build
+
 FROM scratch
 MAINTAINER Romain Baugue <romain.baugue@elwinar.com>
-
-COPY rambler /
+COPY --from=0 /go/src/github.com/elwinar/rambler/rambler /
 CMD ["/rambler", "apply", "-a"]
diff --git a/Makefile b/Makefile
@@ -17,10 +17,6 @@ fetch: ## Fetch the dependencies
 help: ## Get help
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-10s\033[0m %s\n", $$1, $$2}'
 
-.PHONY: image
-image: ## Build the docker image
-	docker build . -t elwinar/rambler --no-cache
-
 .PHONY: release
 release: ## Build the release files
 	xgo --targets=$(TARGETS) --ldflags=$(LDFLAGS) $(PKG)

diff --git a/Vagrantfile b/Vagrantfile
diff --git a/etc/bashrc b/etc/bashrc
diff --git a/etc/mirrorlist b/etc/mirrorlist
diff --git a/etc/nginx.conf b/etc/nginx.conf
diff --git a/etc/npmrc b/etc/npmrc
diff --git a/etc/php.ini b/etc/php.ini
diff --git a/etc/provision.sh b/etc/provision.sh
diff --git a/etc/start.sh b/etc/start.sh