Merge pull request #1193 from deis/1020-make_rsync

feat(Makefile): move rsync from Vagrantfile to Makefile

Author: carmstrong

Makefile

@@ -29,7 +29,7 @@ START_UNITS = $(foreach C,$(START_COMPONENTS),$(wildcard $(C)/systemd/*))
 
 all: build run
 
-build:
+build: rsync
 	$(call ssh_all,'cd share && for c in $(ALL_COMPONENTS); do cd $$c && docker build -t deis/$$c . && cd ..; done')
 
 clean: uninstall
@@ -56,6 +56,9 @@ pull:
 
 restart: stop start
 
+rsync:
+	$(call rsync_all)
+
 run: install start
 
 start: check-fleet start-warning start-routers

Vagrantfile

@@ -46,11 +46,6 @@ Vagrant.configure("2") do |config|
       ip = "172.17.8.#{i+99}"
       config.vm.network :private_network, ip: ip
 
-      # FALLBACK Enable NFS for sharing the host machine into the coreos-vagrant VM.
-      # config.vm.synced_folder ".", "/home/core/share", id: "core", :nfs => true, :mount_options => ['nolock,vers=3,udp']
-      # Note that with rsync, local Deis code changes need to be re-synced to the VM by issuing a `vagrant rsync`
-      config.vm.synced_folder ".", "/home/core/share", type: "rsync"
-
       # user-data bootstrapping
       config.vm.provision :file, :source => "contrib/coreos/user-data", :destination => "/tmp/vagrantfile-user-data"
       # check that the CoreOS user-data file is valid

builder/Makefile

@@ -1,6 +1,7 @@
 include ../includes.mk
 
 build:
+	$(call rsync_all)
 	$(call ssh_all,'cd share/builder && docker build -t deis/builder .')
 
 install: check-fleet

cache/Makefile

@@ -1,6 +1,7 @@
 include ../includes.mk
 
 build:
+	$(call rsync_all)
 	$(call ssh_all,'cd share/cache && sudo docker build -t deis/cache .')
 
 install: check-fleet

contrib/ec2/README.md

@@ -99,7 +99,7 @@ email: info@opdemand.com
 ## Hack on Deis
 If you'd like to use this deployment to build Deis, you'll need to set `DEIS_HOSTS` to an array of your cluster hosts:
 ```console
-$ export DEIS_HOSTS=1.2.3.4 1.2.3.5 1.2.3.6
+$ DEIS_HOSTS="1.2.3.4 2.3.4.5 3.4.5.6" make build
 ```
 
 This variable is used in the `make build` command.

contrib/rackspace/README.md

@@ -85,7 +85,7 @@ email: info@opdemand.com
 ## Hack on Deis
 If you'd like to use this deployment to build Deis, you'll need to set `DEIS_HOSTS` to an array of your cluster hosts:
 ```console
-$ export DEIS_HOSTS=10.21.12.1 10.21.12.2 10.21.12.3
+$ DEIS_HOSTS="1.2.3.4 2.3.4.5 3.4.5.6" make build
 ```
 
 This variable is used in the `make build` command.

controller/Makefile

@@ -5,6 +5,7 @@ include ../includes.mk
 all: build run
 
 build:
+	$(call rsync_all)
 	$(call ssh_all,'cd share/controller && sudo docker build -t deis/controller .')
 
 install: check-fleet

database/Makefile

@@ -1,6 +1,7 @@
 include ../includes.mk
 
 build:
+	$(call rsync_all)
 	$(call ssh_all,'cd share/database && sudo docker build -t deis/database .')
 
 install: check-fleet

includes.mk

@@ -28,6 +28,10 @@ define ssh_all
   for host in $(DEIS_HOSTS); do ssh -o LogLevel=FATAL -o Compression=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PasswordAuthentication=no core@$$host -t $(1); done
 endef
 
+define rsync_all
+  for host in $(DEIS_HOSTS); do rsync -Pave "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --exclude=venv/ --exclude=.git/ --exclude='*.pyc' $(shell pwd)/* core@$$host:/home/core/share; done
+endef
+
 define echo_cyan
   @echo "\033[0;36m$(subst ",,$(1))\033[0m"
 endef

logger/Makefile

@@ -1,6 +1,7 @@
 include ../includes.mk
 
 build:
+	$(call rsync_all)
 	$(call ssh_all,'cd share/logger && sudo docker build -t deis/logger .')
 
 install: check-fleet