Merging with the packaging changes

Merge branch 'master' of https://github.com/rancher/rancher-catalog-service

.dockerignore

@@ -0,0 +1,2 @@
+bin
+dist

.drone.yml

@@ -0,0 +1,3 @@
+image: rancher/dind:v0.6.0
+script:
+ - ./scripts/ci

.gitignore

@@ -0,0 +1,2 @@
+/bin
+/dist

Dockerfile.dapper

@@ -0,0 +1,9 @@
+FROM golang:1.5
+RUN go get github.com/tools/godep
+RUN go get github.com/golang/lint/golint
+ENV DAPPER_SOURCE /go/src/github.com/rancher/rancher-catalog-service
+ENV DAPPER_OUTPUT bin dist
+RUN apt-get update && apt-get install -y xz-utils
+WORKDIR ${DAPPER_SOURCE}
+ENTRYPOINT ["./scripts/entry"]
+CMD ["build"]

README.md

@@ -13,6 +13,24 @@ Design
 
 * The UI integrated with the service will enable the user to view the templates in a catalog format and also launch a template to a specified rancher deployment.
 
+Building
+========
+
+This project uses [dapper](https://github.com/ibuildthecloud/dapper).  Install dapper first
+
+    go get github.com/ibuildthecloud/dapper
+
+```sh
+# Compile
+dapper build
+
+# Run tests
+dapper test
+
+# Run everything
+dapper all
+```
+
 Contact
 ========
 For bugs, questions, comments, corrections, suggestions, etc., open an issue in

manager/catalog_manager.go

@@ -3,17 +3,20 @@ package manager
 import (
 	"flag"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/rancher/rancher-catalog-service/model"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
+	"syscall"
 	"time"
-	"strconv"
+
+	"gopkg.in/yaml.v2"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/rancher/rancher-catalog-service/model"
 )
 
 var (
@@ -54,6 +57,11 @@ func SetEnv() {
 		log.Fatal(err)
 		fmt.Errorf(err)
 	}
+
+	// Shutdown when parent dies
+	if _, _, err := syscall.RawSyscall(syscall.SYS_PRCTL, syscall.PR_SET_PDEATHSIG, uintptr(syscall.SIGTERM), 0); err != 0 {
+		log.Fatal("Failed to set parent death sinal, err")
+	}
 }
 
 func Init() {

scripts/all

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+./scripts/build
+./scripts/test
+#./scripts/validate
+./scripts/package

scripts/build

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+. ./scripts/common
+
+mkdir -p $(dirname $BIN)
+echo Building $BIN
+godep go build -o $BIN $MAIN

scripts/ci

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+cd $(dirname $0)/..
+if [ ! -x "$(which dapper)" ] ;then
+    go get github.com/ibuildthecloud/dapper
+    PATH=$GOPATH/bin:${PATH}
+fi
+docker version >/dev/null 2>&1 || wrapdocker || docker version
+dapper all

scripts/common

@@ -0,0 +1,2 @@
+BIN=bin/rancher-catalog-service
+MAIN=main.go

scripts/dapperw

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+setpath()
+{
+    if [ -x "build/dapper/bin/dapper" ]; then
+        PATH=${PATH}:$(pwd)/build/dapper/bin/dapper
+    fi
+}
+
+setpath
+
+if [ ! -x "$(which dapper)" ]; then
+    (
+        GOPATH=$(pwd)/build/dapper
+        mkdir -p $GOPATH
+        go get github.com/ibuildthecloud/dapper
+    )
+fi
+
+exec dapper "$@"

scripts/entry

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ -e ./scripts/$1 ]; then
+    exec ./scripts/"$@"
+fi
+
+exec "$@"

scripts/package

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+. ./scripts/common
+
+mkdir -p dist/artifacts
+tar cvJf dist/artifacts/$(basename $BIN).tar.xz -C $(dirname $BIN) .

scripts/test

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+godep go test ./...

scripts/validate

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+fmt()
+{
+    local files=$(gofmt -l . | grep -v 'Godeps')
+
+    if [ -n "$files" ]; then
+        echo Failed gofmt
+        echo $files
+        return 1
+    fi
+}
+
+lint()
+{
+    for i in $(find -type d | grep -vE '(Godep|.git)'); do
+        golint $i
+    done
+}
+
+vet()
+{
+    for i in $(find -type d | grep -vE '(Godep|.git|bin|dist|DATA|scripts)'); do
+        go vet $i
+    done
+}
+
+fmt || FAILED=1
+lint || FAILED=1
+vet || FAILED=1
+
+if [ "$FAILED" = 1 ]; then
+    echo Checks failed
+    exit 1
+fi