Fix ip routing because docker changed the default IP (#17)

* Fix IP routing

* Use 65.2 instead

* Cleanup old IPs

* Cleanup old IP

* Detect right IP

Author: tecnobrat

Makefile

@@ -7,6 +7,15 @@ DEVICE := $(shell netstat -rn -f inet | grep -v "link\#" | grep ^default | tr '
 endif
 
 start:
+ifneq (, $(shell ifconfig | grep "192.168.65.1"))
+ifeq ($(UNAME), Linux)
+	@echo "---- LINUX, CLEANING OLD IP ALIAS ----"
+	sudo ifconfig $(DEVICE):tugboat 192.168.65.1 down || true
+else
+	@echo "---- MAC, CLEANING OLD IP ALIAS ----"
+	sudo ifconfig $(DEVICE) -alias 192.168.65.1 || true
+endif
+endif
 	docker-compose stop
 	docker-compose rm -f
 	docker-compose pull
@@ -16,24 +25,25 @@ ifneq (, $(shell docker info | grep "provider=virtualbox"))
 	TUGBOAT_IP=192.168.99.100 docker-compose up
 else
 	@echo "---- YOU ARE RUNNING DOCKER FOR MAC/LINUX ----"
-ifneq (, $(shell ifconfig | grep "192.168.65.1"))
+ifneq (, $(shell ifconfig | grep "192.168.65.2"))
 	@echo "---- IP FOUND ----"
 else
 ifeq ($(UNAME), Linux)
 	@echo "---- LINUX, ADDING IP ALIAS ----"
-	sudo ifconfig $(DEVICE):tugboat 192.168.65.1 up
+	sudo ifconfig $(DEVICE):tugboat 192.168.65.2 up
 else
 	@echo "---- MAC, ADDING IP ALIAS ----"
-	sudo ifconfig $(DEVICE) alias 192.168.65.1 255.255.255.0
+	sudo ifconfig $(DEVICE) alias 192.168.65.2 255.255.255.0
 endif
 endif
-	TUGBOAT_IP=192.168.65.1 docker-compose up
+	TUGBOAT_IP=192.168.65.2 docker-compose up
 endif
 
 stop:
 	docker-compose stop
+	docker-compose rm -f
 ifeq ($(UNAME), Linux)
-	sudo ifconfig $(DEVICE):tugboat 192.168.65.1 down
+	sudo ifconfig $(DEVICE):tugboat 192.168.65.2 down || true
 else
-	sudo ifconfig $(DEVICE) -alias 192.168.65.1
+	sudo ifconfig $(DEVICE) -alias 192.168.65.2 || true
 endif

README.md

@@ -53,7 +53,7 @@ To use a custom configuration (enable SSL, custom SSL cert, custom domain) pleas
 
 `cp docker-compose.override.example.yml docker-compose.override.yml` and then edit to your needs.
 
-**Note:** If you use a custom domain, you need to also setup wildcard DNS to the IP `192.168.65.1`. So if you use the domain `tugboat.ninja`, you need to setup `*.tugboat.ninja` to point to `192.168.65.1`.
+**Note:** If you use a custom domain, you need to also setup wildcard DNS to the IP `192.168.65.2`. So if you use the domain `tugboat.ninja`, you need to setup `*.tugboat.ninja` to point to `192.168.65.2`.
 
 We own and have wildcard DNS set up for the following domains:
 

docker-compose.yml

@@ -15,7 +15,7 @@ services:
 
   registrator:
     image: gliderlabs/registrator:latest
-    command: "-ip ${TUGBOAT_IP:-192.168.99.100} consul://consul:8500"
+    command: "-ip ${TUGBOAT_IP:-192.168.65.2} consul://consul:8500"
     dns_search: ""
     volumes:
       - "/var/run/docker.sock:/tmp/docker.sock"

start.bat

@@ -1,4 +1,4 @@
-set TUGBOAT_IP=192.168.65.1
+set TUGBOAT_IP=192.168.65.2
 
 docker-compose stop
 docker-compose rm -f