From 6ca9ca7c0919408f86170a3e28ea8498ef85c7f7 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 16 Oct 2014 13:16:22 -0700 Subject: [PATCH 1/2] updating README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d78fa2d3d..d72845376 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ * Docker * AUFS + We highly recommend running Docker with the AUFS storage driver. You can verify Docker is using the AUFS storage driver with the following command `sudo docker info | grep Driver:` From e49b81e7a40580bd30337fabbda2cebd4811b0ad Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 16 Oct 2014 20:40:26 -0700 Subject: [PATCH 2/2] updated Makefile to create `packaging/output` during build step --- Makefile | 2 +- server/session/session.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f1ff5a99b..390fea967 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ test_postgres: TEST_DRIVER="postgres" TEST_DATASOURCE="host=127.0.0.1 user=postgres dbname=postgres sslmode=disable" go test -short github.com/drone/drone/server/datastore/database build: + mkdir -p packaging/output mkdir -p packaging/root/usr/local/bin go build -o packaging/root/usr/local/bin/drone -ldflags "-X main.revision $(SHA)" github.com/drone/drone/cli go build -o packaging/root/usr/local/bin/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server @@ -36,7 +37,6 @@ clean: rm -rf packaging/output rm -f packaging/root/usr/local/bin/drone rm -f packaging/root/usr/local/bin/droned - mkdir -p packaging/output lessc: lessc --clean-css server/app/styles/drone.less server/app/styles/drone.css diff --git a/server/session/session.go b/server/session/session.go index 9330ab0da..b0c44e038 100644 --- a/server/session/session.go +++ b/server/session/session.go @@ -66,7 +66,6 @@ func getUserBearer(c context.Context, r *http.Request) *model.User { return []byte(*secret), nil }) if err != nil || !token.Valid { - println("invalid token") return nil } var userid, ok = token.Claims["user_id"].(float64)