Move to completely new IP subnet (#19)

* New subnet

* Setx

* Run in correct shell, use set

* No new window, use setx too

* Set env properly

* always elavate

* Avoid logging errors for missing switch/ipaddress, add progress logging, etc.

* README section on windows networking no longer needed

Author: tecnobrat

Makefile

@@ -15,6 +15,15 @@ else
 	@echo "---- MAC, CLEANING OLD IP ALIAS ----"
 	sudo ifconfig $(DEVICE) -alias 192.168.65.1 || true
 endif
+endif
+ifneq (, $(shell ifconfig | grep "192.168.65.2"))
+ifeq ($(UNAME), Linux)
+	@echo "---- LINUX, CLEANING OLD IP ALIAS ----"
+	sudo ifconfig $(DEVICE):tugboat 192.168.65.2 down || true
+else
+	@echo "---- MAC, CLEANING OLD IP ALIAS ----"
+	sudo ifconfig $(DEVICE) -alias 192.168.65.2 || true
+endif
 endif
 	docker-compose stop
 	docker-compose rm -f
@@ -25,25 +34,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.2"))
+ifneq (, $(shell ifconfig | grep "10.156.156.1"))
 	@echo "---- IP FOUND ----"
 else
 ifeq ($(UNAME), Linux)
 	@echo "---- LINUX, ADDING IP ALIAS ----"
-	sudo ifconfig $(DEVICE):tugboat 192.168.65.2 up
+	sudo ifconfig $(DEVICE):tugboat 10.156.156.1 up
 else
 	@echo "---- MAC, ADDING IP ALIAS ----"
-	sudo ifconfig $(DEVICE) alias 192.168.65.2 255.255.255.0
+	sudo ifconfig $(DEVICE) alias 10.156.156.1 255.255.255.0
 endif
 endif
-	TUGBOAT_IP=192.168.65.2 docker-compose up
+	TUGBOAT_IP=10.156.156.1 docker-compose up
 endif
 
 stop:
 	docker-compose stop
 	docker-compose rm -f
 ifeq ($(UNAME), Linux)
-	sudo ifconfig $(DEVICE):tugboat 192.168.65.2 down || true
+	sudo ifconfig $(DEVICE):tugboat 10.156.156.1 down || true
 else
-	sudo ifconfig $(DEVICE) -alias 192.168.65.2 || true
+	sudo ifconfig $(DEVICE) -alias 10.156.156.1 || true
 endif

README.md

@@ -35,12 +35,6 @@ Now run `docker-compose up` on your project.
 
 Then simply go to `http://awesome-service.tugboat.zone/` (docker toolbox) or `http://awesome-service.native.tugboat.zone` (docker native) in your browser (because we set the name to be `awesome-service`)
 
-## Docker for Windows
-
-Docker for Windows needs to have its network subnet set to a very specific subnet.  Right-click on the docker icon in your system tray, once in settings, edit the Network settings to look like:
-
-![](/windows-network.png)
-
 ## SSL Support
 
 This project by default provides SSL support using a self-signed SSL cert for `*.tugboat.zone`

docker-compose.yml

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

start.bat

@@ -0,0 +1,13 @@
+$scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
+
+$arguments = "& '" + $scriptDir + "/windows-networking.ps1'"
+$p = Start-Process powershell -Verb runas -ArgumentList $arguments -Wait
+$p.HasExited
+$p.ExitCode
+
+Set-Item Env:TUGBOAT_IP "10.156.156.1"
+
+docker-compose stop
+docker-compose rm -f
+docker-compose build
+docker-compose up

start.ps1

@@ -0,0 +1,18 @@
+Import-Module Hyper-V
+
+Write-Host Checking tugboat Hyper-V VMSwitch configuration...
+
+if ((Get-VMSwitch -Name Tugboat -ErrorAction SilentlyContinue).Name -eq $null) {
+  Write-Host No tugboat Hyper-V VMSwitch present. Creating one now...
+  New-VMSwitch -Name Tugboat -SwitchType Internal -Notes 'Added by tugboat to route your docker containers' | Out-Null
+  Write-Host SUCCESS!
+}
+
+if ((Get-NetIPAddress -IPAddress 10.156.156.1 -ErrorAction SilentlyContinue).InterfaceAlias -eq $null) {
+  Write-Host Tugboat IP address not configured. Configuring now...
+  $ifIndex = $(Get-NetAdapter | Where-Object { $_.Name -eq "vEthernet (Tugboat)" } ).ifIndex
+  New-NetIPAddress -InterfaceIndex $ifIndex -IPAddress 10.156.156.1 -PrefixLength 24 | Out-Null
+  Write-Host SUCCESS!
+}
+
+Write-Host Tugboat Hyper-V VMSwitch configured!