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

Bump golang from 1.12.8-stretch to 1.13.3-stretch #153

Merged
merged 8 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- "1.12.4"
- "1.13.3"

services:
- docker
Expand Down
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM golang:1.12.8-stretch as builder
FROM golang:1.13.3-stretch as builder

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

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

COPY . .
RUN ./grapi build
Expand Down
5 changes: 4 additions & 1 deletion app/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/izumin5210/grapi/pkg/grapiserver"
"github.com/rs/cors"
"github.com/srvc/appctx"
"github.com/volatiletech/sqlboiler/boil"
"google.golang.org/grpc/grpclog"

Expand All @@ -18,6 +19,8 @@ import (

// Run starts the grapiserver.
func Run() error {
ctx := appctx.Global()

cfg, err := config.LoadConfig()
if err != nil {
grpclog.Errorf("%+v", err)
Expand Down Expand Up @@ -89,5 +92,5 @@ func Run() error {
}
}()

return s.Serve()
return s.Serve(ctx)
}
32 changes: 20 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,57 @@ module github.com/ProgrammingLab/prolab-accounts
go 1.12

require (
contrib.go.opencensus.io/exporter/stackdriver v0.7.0 // indirect
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 // indirect
github.com/PuerkitoBio/goquery v1.5.0 // indirect
github.com/go-redis/redis v6.14.1+incompatible
github.com/gobuffalo/envy v1.7.0 // indirect
github.com/gobuffalo/packr/v2 v2.1.0
github.com/gobwas/glob v0.2.3
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/gogo/protobuf v1.2.1
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
github.com/golang/mock v1.3.1 // indirect
github.com/golang/protobuf v1.3.2
github.com/google/wire v0.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.9.6
github.com/izumin5210/grapi v0.4.0
github.com/izumin5210/gex v0.6.0 // indirect
github.com/izumin5210/grapi v0.5.0
github.com/joho/godotenv v1.3.0
github.com/jordan-wright/email v0.0.0-20180115032944-94ae17dedda2
github.com/kat-co/vala v0.0.0-20140812221447-bfe9b50e828a
github.com/kelseyhightower/envconfig v1.3.0
github.com/lib/pq v1.0.0
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/lib/pq v1.2.0
github.com/magiconair/properties v1.8.1 // indirect
github.com/minio/minio-go v0.0.0-20190207005939-34f2b94c43ca
github.com/mmcdole/gofeed v1.0.0-beta2
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
github.com/mwitkow/go-proto-validators v0.0.0-20190212092829-1f388280e944
github.com/openzipkin/zipkin-go v0.1.1 // indirect
github.com/ory/hydra v1.0.3
github.com/onsi/ginkgo v1.7.0 // indirect
github.com/onsi/gomega v1.4.3 // indirect
github.com/ory/hydra-legacy-sdk v0.0.0-20190409103449-1f564942be76
github.com/ory/sqlcon v0.0.7 // indirect
github.com/pelletier/go-toml v1.4.0 // indirect
github.com/pkg/errors v0.8.1
github.com/rs/cors v1.6.0
github.com/shurcooL/githubv4 v0.0.0-20190119021625-d9689b595017
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.4.0
github.com/srvc/appctx v0.1.0
github.com/volatiletech/inflect v0.0.0-20170731032912-e7201282ae8d // indirect
github.com/volatiletech/null v8.0.0+incompatible
github.com/volatiletech/sqlboiler v3.2.0+incompatible
github.com/xanzy/go-gitlab v0.13.0 // indirect
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
golang.org/x/image v0.0.0-20190802002840-cff245a6509b
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab // indirect
google.golang.org/appengine v1.6.1 // indirect
google.golang.org/genproto v0.0.0-20190817000702-55e96fffbd48
google.golang.org/grpc v1.23.0
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
gopkg.in/ini.v1 v1.42.0 // indirect
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 // indirect
)

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