Skip to content

Commit 2cd3699

Browse files
committed
Add missing vendor entries, update bindata
1 parent 54aae68 commit 2cd3699

File tree

3 files changed

+643
-6
lines changed

3 files changed

+643
-6
lines changed

auth_server/Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ deps:
1515
govendor sync
1616
go install -v github.com/cesanta/docker_auth/auth_server/vendor/github.com/jteeuwen/go-bindata/go-bindata
1717

18+
generate:
19+
go generate \
20+
github.com/cesanta/docker_auth/auth_server \
21+
github.com/cesanta/docker_auth/auth_server/authn/... \
22+
github.com/cesanta/docker_auth/auth_server/authz/... \
23+
github.com/cesanta/docker_auth/auth_server/mgo_session/... \
24+
github.com/cesanta/docker_auth/auth_server/server/...
25+
1826
build:
19-
go generate ./...
2027
CGO_ENABLED=0 go build -v -i --ldflags=--s
2128

2229
ca-certificates.crt:
@@ -25,12 +32,12 @@ ca-certificates.crt:
2532
build-release: ca-certificates.crt
2633
docker run --rm -v $(PWD)/..:/go/src/github.com/cesanta/docker_auth \
2734
$(BUILDER_IMAGE) sh -x -c "\
28-
apk update && apk add git py2-pip && pip install GitPython && \
35+
apk update && apk add git make py2-pip && pip install GitPython && \
2936
cd /go/src/github.com/cesanta/docker_auth/auth_server && \
3037
go get -v -u github.com/kardianos/govendor && \
3138
umask 0 && govendor sync -v && \
3239
go install -v github.com/cesanta/docker_auth/auth_server/vendor/github.com/jteeuwen/go-bindata/go-bindata && \
33-
go generate ./... && \
40+
make generate && \
3441
go build -v"
3542
@echo === Built version $(VERSION) ===
3643

@@ -40,7 +47,7 @@ auth_server:
4047
@echo
4148
@exit 1
4249

43-
docker-build: build
50+
docker-build:
4451
docker build -t $(IMAGE):latest .
4552
docker tag $(IMAGE):latest $(IMAGE):$(VERSION)
4653

auth_server/authn/bindata.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)