Cleaned up build script + raml2html is now run automatically after builds

Signed-off-by: Bill Robinson <[email protected]>

Author: dseevr

Makefile

@@ -4,10 +4,7 @@
 all: build
 
 build: modelgen
-	bash generate.sh
-	go install ./ ./client/
-	docker run --rm -u $(shell id -u):$(shell id -g) -v $(PWD):/files -w /files/spec ruby:2.4.0-slim /usr/local/bin/ruby contivModel2raml.rb
-	mv spec/netmaster.raml ./spec/contiv/libraries/netmaster.raml
+	@bash ./scripts/build.sh
 
 modelgen:
 	@if [ -z "`which modelgen`" ]; then go get -v github.com/contiv/modelgen; fi

generate.sh

@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
 $GOPATH/bin/modelgen ./ ./
-gofmt -w *.go
-gofmt -w client/*.go
+gofmt -s -w *.go
+gofmt -s -w client/*.go

scripts/build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# build and install the code
+bash generate.sh
+go install ./ ./client/
+
+# regenerate netmaster.raml
+docker run --rm \
+       -u $(id -u):$(id -g) \
+       -v $(pwd):/files \
+       -w /files/spec \
+       ruby:2.4.0-slim /usr/local/bin/ruby contivModel2raml.rb
+mv spec/netmaster.raml ./spec/contiv/libraries/netmaster.raml
+
+# run the raml2html tool to generate docs under spec/docs
+cd spec
+make docs
+mkdir -p docs
+mv contiv.html docs/

spec/build.sh

@@ -5,4 +5,4 @@ set -euo pipefail
 docker build -t contiv/spec .
 cid=$(docker run -itd contiv/spec)
 docker cp ${cid}:/contiv/contiv.html .
-docker rm -f -v ${cid}
+docker rm -fv ${cid}