From 903489c3955defc4d387717a272841f348bcfb86 Mon Sep 17 00:00:00 2001 From: "Jonathan Leibiusky @xetorthio" Date: Mon, 21 Nov 2016 20:48:29 -0300 Subject: [PATCH] Remove unncesary make target and add instructions on how to use the makefile --- Makefile | 4 ---- README.md | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 68a0aff..e91a018 100644 --- a/Makefile +++ b/Makefile @@ -22,9 +22,5 @@ start: # Mount the host's GOPATH shared folder docker-machine ssh pwd "sudo mount -t vboxsf gopathsrc /go/src" -# Runs the app -run: - @eval $$(docker-machine env pwd); \ - docker-compose up .PHONY: prepare start run diff --git a/README.md b/README.md index 223e0ec..d5d4773 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,11 @@ just run `docker swarm init`. It's also necessary to manually load the IPVS kernel module because as swarms are created in `dind`, the daemon won't load it automatically. Run the following command for that purpose: `sudo lsmod xt_ipvs` +If you are developing, there is a `Makefile` file with 2 targets that can set the whole environment for you (using docker-machine and virtual box). +Just run once `make create`, which will create the docker-machine environment. +Additionally, every time you want to start you environment run `make start`. +And to start the application on a container on the docker machine host, run: `eval $(docker-machine env pwd) && docker-compose up` + ## Installation