From 81291c5cc222381a0825eabb9ea8a936b6e1ab03 Mon Sep 17 00:00:00 2001 From: Craig Willis Date: Fri, 1 Apr 2016 10:41:02 -0500 Subject: [PATCH 1/4] Changed to wily --- apiserver/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/Dockerfile b/apiserver/Dockerfile index 4d541dd8..b0037311 100644 --- a/apiserver/Dockerfile +++ b/apiserver/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:wily MAINTAINER willis8@illinois.edu RUN apt-get update -y && apt-get install -y curl git From 303eae9bb6825bd4032e642780f6d2f8193c8aef Mon Sep 17 00:00:00 2001 From: Craig Willis Date: Fri, 1 Apr 2016 11:50:42 -0500 Subject: [PATCH 2/4] Fixed #10 --- apiserver/server.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apiserver/server.go b/apiserver/server.go index b5e4309d..64e0cce3 100644 --- a/apiserver/server.go +++ b/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 From 40f1172e14d55f03443cdda45d26740891e8ed02 Mon Sep 17 00:00:00 2001 From: Craig Willis Date: Fri, 1 Apr 2016 11:51:14 -0500 Subject: [PATCH 3/4] Fixed problem in build script --- apiserver/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apiserver/build.sh b/apiserver/build.sh index e3bbc3aa..df098331 100755 --- a/apiserver/build.sh +++ b/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 From b28f45afad2ea813a4862884c64b8d8571a3d7eb Mon Sep 17 00:00:00 2001 From: Craig Willis Date: Fri, 1 Apr 2016 11:53:25 -0500 Subject: [PATCH 4/4] Build new version of api server --- apiserver/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/version.go b/apiserver/version.go index 00921b9f..f02efbd2 100644 --- a/apiserver/version.go +++ b/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" )