Merge pull request mbentley#6 from mbentley/demo

Updates to demo app
sthwaites · May 9, 2016 · b7d66fe · b7d66fe
2 parents ba114d9 + 9bb78a6
commit b7d66fe
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 16 deletions.
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
@@ -9,12 +9,12 @@ services:
     environment:
       - "constraint:provider==${PROVIDER}"
       - "TITLE=Docker Demo-${ENVIRONMENT}"
+      - "DB_HOST=db"
+      - "DB_PORT=5432"
       - "DB_USER=${DB_USER}"
       - "DB_PASS=${DB_PASS}"
       - "DB_NAME=${DB_NAME}"
       - "DB_SSL_MODE=disable"
-      - "DB_PORT_5432_TCP_ADDR=db"
-      - "DB_PORT_5432_TCP_PORT=5432"
       - "INTERLOCK_DATA={\"hostname\":\"docker-${ENVIRONMENT}\",\"domain\":\"${DOMAIN_NAME}\"}"
     networks:
       - docker-demo
@@ -36,8 +36,6 @@ services:
       - docker-demo
     expose:
       - "5432"
-    ports:
-      - "${POSTGRES_PORT}:5432"
     labels:
       - "com.docker.ucp.access.label=${COMPOSE_PROJECT}"
 

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -7,13 +7,16 @@ services:
     command: -c "sleep 5 && go-wrapper run" # sleep because the postgres container isn't ready on first start
     environment:
       - "TITLE=${TITLE}"
+      - "DB_HOST=db"
+      - "DB_PORT=5432"
+      - "DB_NAME=${DB_NAME}"
       - "DB_USER=${DB_USER}"
       - "DB_PASS=${DB_PASS}"
-      - "DB_NAME=${DB_NAME}"
       - "DB_SSL_MODE=disable"
-    links:
-      - "db:db"
-    network_mode: "bridge"
+    depends_on:
+      - db
+    networks:
+      - docker-demo
     ports:
       - "8080"
     expose:
@@ -25,10 +28,15 @@ services:
       - "POSTGRES_PASSWORD=${DB_PASS}"
     volumes:
       - postgres-data:/var/lib/postgresql/data
-    network_mode: "bridge"
+    networks:
+      - docker-demo
     expose:
       - "5432"
 
+networks:
+  docker-demo:
+    driver: bridge
+
 volumes:
   postgres-data:
     driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,13 +7,16 @@ services:
     command: -c "sleep 5 && go-wrapper run" # sleep because the postgres container isn't ready on first start
     environment:
       - "TITLE=Docker Demo"
+      - "DB_HOST=db"
+      - "DB_PORT=5432"
+      - "DB_NAME=demo"
       - "DB_USER=demo"
       - "DB_PASS=demo"
-      - "DB_NAME=demo"
       - "DB_SSL_MODE=disable"
-    links:
-      - "db:db"
-    network_mode: "bridge"
+    depends_on:
+      - db
+    networks:
+      - docker-demo
     ports:
       - "8080:8080"
     expose:
@@ -25,10 +28,15 @@ services:
       - "POSTGRES_PASSWORD=demo"
     volumes:
       - postgres-data:/var/lib/postgresql/data
-    network_mode: "bridge"
+    networks:
+      - docker-demo
     expose:
       - "5432"
 
+networks:
+  docker-demo:
+    driver: bridge
+
 volumes:
   postgres-data:
     driver: local
diff --git a/main.go b/main.go
@@ -102,11 +102,13 @@ func main() {
 	flag.Parse()
 	// load vars from env
 	if DbHost == "" {
-		DbHost = os.Getenv("DB_PORT_5432_TCP_ADDR")
+		//DbHost = os.Getenv("DB_PORT_5432_TCP_ADDR")
+		DbHost = os.Getenv("DB_HOST")
 	}
 
 	if DbPort == 0 {
-		port := os.Getenv("DB_PORT_5432_TCP_PORT")
+		//port := os.Getenv("DB_PORT_5432_TCP_PORT")
+		port := os.Getenv("DB_PORT")
 		if port != "" {
 			p, err := strconv.Atoi(port)
 			if err != nil {