Skip to content

Commit 686e809

Browse files
carmstrongcarmstrong
committed
Merge pull request #2306 from aledbf/improve_nginx_log
feat(router): improve log output.
2 parents c252a52 + 7270aa9 commit 686e809

109 files changed

Lines changed: 9750 additions & 4 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎router/parent/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ RUN DOCKER_BUILD=true /go/src/github.com/deis/deis/router/build.sh
88

99
RUN tar -C /opt/nginx -czf /nginx.tgz .
1010

11-
ADD boot.go /go/src/github.com/deis/deis/router/boot.go
11+
RUN go get github.com/tools/godep
1212

13-
RUN go get
13+
ADD . /go/src/github.com/deis/deis/router/
1414

15-
RUN CGO_ENABLED=0 go build -a -ldflags '-s' boot.go
15+
RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' boot.go
1616

1717
RUN cp /go/src/github.com/deis/deis/router/boot /go/bin/boot

‎router/parent/Godeps/Godeps.json‎

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

‎router/parent/Godeps/Readme‎

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

‎router/parent/Godeps/_workspace/.gitignore‎

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

‎router/parent/Godeps/_workspace/src/github.com/ActiveState/tail/.gitignore‎

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

‎router/parent/Godeps/_workspace/src/github.com/ActiveState/tail/.travis.yml‎

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

‎router/parent/Godeps/_workspace/src/github.com/ActiveState/tail/CHANGES.md‎

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

‎router/parent/Godeps/_workspace/src/github.com/ActiveState/tail/Dockerfile‎

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

‎router/parent/Godeps/_workspace/src/github.com/ActiveState/tail/LICENSE.txt‎

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

‎router/parent/Godeps/_workspace/src/github.com/ActiveState/tail/Makefile‎

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

0 commit comments

Comments
 (0)