Merge pull request #12 from craig-willis/master

Minor build changes, fix #10

apiserver/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:wily
 MAINTAINER [email protected]
 
 RUN apt-get update -y && apt-get install -y curl git

apiserver/build.sh

@@ -33,10 +33,10 @@ elif [ "$1" = "test" ]; then
 elif [ "$1" = "release" ]; then
 	echo Building release image
 	docker build -t ndslabs/apiserver:latest .
-	docker build -t ndslabs/apiserver:$(VERSION) .
+	docker build -t ndslabs/apiserver:$VERSION .
 	echo Pushing release image
 	docker push ndslabs/apiserver:latest
-	docker push ndslabs/apiserver:$(VERSION)
+	docker push ndslabs/apiserver:$VERSION
 elif [ "$1" = "clean" ]; then
 	echo Cleaning
 	rm -rf build

apiserver/server.go

@@ -852,9 +852,11 @@ func (s *Server) stackServiceExists(pid string, id string) bool {
 
 	exists := false
 	for _, stack := range *stacks {
-		if stack.Id == id {
-			exists = true
-			break
+		for _, stackService := range stack.Services {
+			if stackService.Id == id {
+				exists = true
+				break
+			}
 		}
 	}
 	return exists

apiserver/version.go

@@ -1,5 +1,5 @@
 package main
 const (
   VERSION = "1.0-alpha"
-  BUILD_DATE = "2016-03-31 15:55"
+  BUILD_DATE = "2016-04-01 11:51"
 )