Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Commit 66f9940

Browse files
authored
Merge pull request #153 from ProgrammingLab/dependabot/docker/golang-1.13.0-stretch
Bump golang from 1.12.8-stretch to 1.13.3-stretch
2 parents 507b92f + 0f991f8 commit 66f9940

File tree

5 files changed

+94
-868
lines changed

5 files changed

+94
-868
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: go
22

33
go:
4-
- "1.12.4"
4+
- "1.13.3"
55

66
services:
77
- docker

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
FROM golang:1.12.8-stretch as builder
1+
FROM golang:1.13.3-stretch as builder
22

33
ENV GO111MODULE on
44
WORKDIR /go/src/github.com/ProgrammingLab/prolab-accounts
55

6-
RUN curl -Lo grapi https://github.com/izumin5210/grapi/releases/download/v0.4.0/grapi_linux_amd64
7-
RUN chmod +x grapi
6+
RUN curl -Lo grapi_linux_amd64.tar.gz https://github.com/izumin5210/grapi/releases/download/v0.5.0/grapi_linux_amd64.tar.gz \
7+
&& tar -xzf grapi_linux_amd64.tar.gz \
8+
&& mv ./grapi_linux_amd64/grapi . \
9+
&& chmod +x grapi \
10+
&& rm -f grapi_linux_amd64.tar.gz
811

912
COPY . .
1013
RUN ./grapi build

app/run.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/grpc-ecosystem/grpc-gateway/runtime"
77
"github.com/izumin5210/grapi/pkg/grapiserver"
88
"github.com/rs/cors"
9+
"github.com/srvc/appctx"
910
"github.com/volatiletech/sqlboiler/boil"
1011
"google.golang.org/grpc/grpclog"
1112

@@ -18,6 +19,8 @@ import (
1819

1920
// Run starts the grapiserver.
2021
func Run() error {
22+
ctx := appctx.Global()
23+
2124
cfg, err := config.LoadConfig()
2225
if err != nil {
2326
grpclog.Errorf("%+v", err)
@@ -89,5 +92,5 @@ func Run() error {
8992
}
9093
}()
9194

92-
return s.Serve()
95+
return s.Serve(ctx)
9396
}

go.mod

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,57 @@ module github.com/ProgrammingLab/prolab-accounts
33
go 1.12
44

55
require (
6-
contrib.go.opencensus.io/exporter/stackdriver v0.7.0 // indirect
7-
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 // indirect
86
github.com/PuerkitoBio/goquery v1.5.0 // indirect
97
github.com/go-redis/redis v6.14.1+incompatible
108
github.com/gobuffalo/envy v1.7.0 // indirect
119
github.com/gobuffalo/packr/v2 v2.1.0
1210
github.com/gobwas/glob v0.2.3
11+
github.com/gofrs/uuid v3.2.0+incompatible // indirect
1312
github.com/gogo/protobuf v1.2.1
14-
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
13+
github.com/golang/mock v1.3.1 // indirect
1514
github.com/golang/protobuf v1.3.2
15+
github.com/google/wire v0.3.0 // indirect
1616
github.com/grpc-ecosystem/grpc-gateway v1.9.6
17-
github.com/izumin5210/grapi v0.4.0
17+
github.com/izumin5210/gex v0.6.0 // indirect
18+
github.com/izumin5210/grapi v0.5.0
1819
github.com/joho/godotenv v1.3.0
1920
github.com/jordan-wright/email v0.0.0-20180115032944-94ae17dedda2
2021
github.com/kat-co/vala v0.0.0-20140812221447-bfe9b50e828a
2122
github.com/kelseyhightower/envconfig v1.3.0
22-
github.com/lib/pq v1.0.0
23+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
24+
github.com/lib/pq v1.2.0
25+
github.com/magiconair/properties v1.8.1 // indirect
2326
github.com/minio/minio-go v0.0.0-20190207005939-34f2b94c43ca
2427
github.com/mmcdole/gofeed v1.0.0-beta2
2528
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
2629
github.com/mwitkow/go-proto-validators v0.0.0-20190212092829-1f388280e944
27-
github.com/openzipkin/zipkin-go v0.1.1 // indirect
28-
github.com/ory/hydra v1.0.3
30+
github.com/onsi/ginkgo v1.7.0 // indirect
31+
github.com/onsi/gomega v1.4.3 // indirect
2932
github.com/ory/hydra-legacy-sdk v0.0.0-20190409103449-1f564942be76
30-
github.com/ory/sqlcon v0.0.7 // indirect
33+
github.com/pelletier/go-toml v1.4.0 // indirect
3134
github.com/pkg/errors v0.8.1
3235
github.com/rs/cors v1.6.0
3336
github.com/shurcooL/githubv4 v0.0.0-20190119021625-d9689b595017
3437
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
38+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
3539
github.com/spf13/viper v1.4.0
40+
github.com/srvc/appctx v0.1.0
3641
github.com/volatiletech/inflect v0.0.0-20170731032912-e7201282ae8d // indirect
3742
github.com/volatiletech/null v8.0.0+incompatible
3843
github.com/volatiletech/sqlboiler v3.2.0+incompatible
39-
github.com/xanzy/go-gitlab v0.13.0 // indirect
40-
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
44+
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
4145
golang.org/x/image v0.0.0-20190802002840-cff245a6509b
42-
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
46+
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
4347
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
4448
golang.org/x/sync v0.0.0-20190423024810-112230192c58
49+
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
50+
golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab // indirect
51+
google.golang.org/appengine v1.6.1 // indirect
4552
google.golang.org/genproto v0.0.0-20190817000702-55e96fffbd48
4653
google.golang.org/grpc v1.23.0
54+
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
4755
gopkg.in/ini.v1 v1.42.0 // indirect
48-
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
56+
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 // indirect
4957
)
5058

5159
replace github.com/gofrs/uuid v0.0.0-20180830191909-370558f003bf => github.com/gofrs/uuid/v3 v3.1.1

0 commit comments

Comments
 (0)