Merge c5445e1 into f0b40f1

.cobra.yaml

@@ -0,0 +1,2 @@
+author: Aeneas Rekkas <aeneas@ory.am>
+license: Apache License Version 2.0

.docker-home/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

.dockerignore

@@ -0,0 +1 @@
+vendor/

.gitignore

@@ -6,3 +6,6 @@ node_modules/
 *.log
 *.stackdump
 .DS_Store
+vendor/
+.hydra.yml
+cover.out

.travis.yml

@@ -1,8 +1,3 @@
-go test sudo: required
-
-services:
-  - docker
-
 env:
   - DOCKER_BIND_LOCALHOST=true GO15VENDOREXPERIMENT=1
 
@@ -13,14 +8,13 @@ go:
   - 1.6
 
 install:
-  - go get github.com/axw/gocov/gocov
-  - go get github.com/mattn/goveralls
-  - go get golang.org/x/tools/cmd/cover
-  - go get github.com/golang/lint/golint
-  - go get github.com/pierrre/gotestcover
-  - go get -t $(go list ./... | grep -v /vendor/)
+  - go get github.com/axw/gocov/gocov github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover
+  # Workaround for travis
+  - go get -t -v ./...
+  - go install github.com/ory-am/hydra
 
 script:
-  # - go vet -x ./...
-  - gotestcover -coverprofile="cover.out" -race -covermode="count" $(go list ./... | grep -v /vendor/)
+  - go test -race $(go list ./... | grep -v /vendor | grep -v /cmd)
+  - gotestcover -coverprofile="cover.out" $(go list ./... | grep -v /vendor/)
   - goveralls -coverprofile="cover.out"
+  - $GOPATH/bin/hydra

Dockerfile

@@ -0,0 +1,12 @@
+FROM golang:1.6
+
+ADD . /go/src/github.com/ory-am/hydra
+WORKDIR /go/src/github.com/ory-am/hydra
+
+RUN go get github.com/Masterminds/glide
+RUN glide install
+RUN go install github.com/ory-am/hydra
+
+ENTRYPOINT /go/bin/hydra host
+
+EXPOSE 4444

Dockerfile-dangerous

@@ -0,0 +1,12 @@
+FROM golang:1.6
+
+ADD . /go/src/github.com/ory-am/hydra
+WORKDIR /go/src/github.com/ory-am/hydra
+
+RUN go get github.com/Masterminds/glide
+RUN glide install
+RUN go install github.com/ory-am/hydra
+
+ENTRYPOINT /go/bin/hydra host --dangerous-auto-logon
+
+EXPOSE 4444

Procfile

@@ -1 +1 @@
-web: hydra-host start
+web: hydra host