Skip to content

Commit

Permalink
build: Improve build pipeline (ory#1114)
Browse files Browse the repository at this point in the history
Signed-off-by: arekkas <aeneas@ory.am>
  • Loading branch information
aeneasr authored Oct 24, 2018
1 parent 65b7406 commit fdea011
Show file tree
Hide file tree
Showing 1,695 changed files with 55 additions and 439,526 deletions.
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ test/
scripts/
sdk/js
sdk/php
docs/
docs/
vendor/
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ Dockerfile-plugin-*
plugin-*.so
hydra-docker-bin
cookies.txt
vendor/
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENV GO111MODULE=on
ADD ./go.mod ./go.mod
ADD ./go.sum ./go.sum

RUN go mod download

ADD . .

Expand Down
1 change: 1 addition & 0 deletions Dockerfile-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN go mod download

ADD . .

RUN go mod verify
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/ory/hydra/cmd.Version=$git_tag -X github.com/ory/hydra/cmd.BuildTime=`TZ=UTC date -u '+%Y-%m-%dT%H:%M:%SZ'` -X github.com/ory/hydra/cmd.GitHash=$git_commit" -a -installsuffix cgo -o hydra

FROM alpine:3.7
Expand Down
15 changes: 5 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
module github.com/ory/hydra

require (
cloud.google.com/go v0.31.0 // indirect
contrib.go.opencensus.io/exporter/stackdriver v0.7.0 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/go-sql-driver/mysql v1.4.0
github.com/golang/mock v1.1.1
github.com/google/go-cmp v0.2.0 // indirect
github.com/google/martian v2.1.0+incompatible // indirect
github.com/gorilla/context v1.1.1
github.com/gorilla/securecookie v0.0.0-20160422134519-667fe4e3466a
github.com/gorilla/sessions v0.0.0-20160922145804-ca9ada445741
Expand All @@ -20,7 +21,6 @@ require (
github.com/kr/pretty v0.1.0 // indirect
github.com/lib/pq v1.0.0
github.com/mattn/go-sqlite3 v1.9.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.0 // indirect
github.com/meatballhat/negroni-logrus v0.0.0-20170801195057-31067281800f
github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
Expand All @@ -35,29 +35,24 @@ require (
github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5
github.com/pkg/errors v0.8.0
github.com/prometheus/client_golang v0.8.0
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 // indirect
github.com/prometheus/common v0.0.0-20180426121432-d811d2e9bf89 // indirect
github.com/prometheus/procfs v0.0.0-20180408092902-8b1c2da0d56d // indirect
github.com/rs/cors v1.6.0
github.com/rubenv/sql-migrate v0.0.0-20170824124545-79fe99e24311
github.com/sirupsen/logrus v1.1.1
github.com/spf13/cobra v0.0.3
github.com/spf13/viper v1.2.1
github.com/sqs/goreturns v0.0.0-20180302073349-83e02874ec12 // indirect
github.com/stretchr/testify v1.2.2
github.com/toqueteos/webbrowser v0.0.0-20150720201625-21fc9f95c834
github.com/uber-go/atomic v1.3.2 // indirect
github.com/uber/jaeger-client-go v2.14.0+incompatible
github.com/uber/jaeger-lib v1.5.0 // indirect
github.com/urfave/negroni v1.0.0
github.com/ziutek/mymysql v1.5.4 // indirect
go.opencensus.io v0.18.0 // indirect
go.uber.org/atomic v1.3.2 // indirect
golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4
golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e // indirect
golang.org/x/tools v0.0.0-20181015201034-8919434dde1e // indirect
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/go-resty/resty.v0 v0.4.1 // indirect
gopkg.in/gorp.v1 v1.7.1 // indirect
gopkg.in/resty.v1 v1.9.1
gopkg.in/square/go-jose.v2 v2.1.9
Expand Down
81 changes: 45 additions & 36 deletions go.sum

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions vendor/github.com/Azure/go-ansiterm/LICENSE

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/Azure/go-ansiterm/README.md

This file was deleted.

188 changes: 0 additions & 188 deletions vendor/github.com/Azure/go-ansiterm/constants.go

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/Azure/go-ansiterm/context.go

This file was deleted.

49 changes: 0 additions & 49 deletions vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

This file was deleted.

Loading

0 comments on commit fdea011

Please sign in to comment.