Commit 93a1a002 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Update docker build files to Go 1.13.0 on Alpine 3.10. Fix incorrect module pseudo-versions.

parent 90153036

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Session tokens now allow storage of arbitrary string key-value pairs.



### Changed

- Use Go 1.12.9 on Alpine 3.10 as base Docker container image and native builds.

- Use Go 1.13.0 on Alpine 3.10 as base Docker container image and native builds.

- Update devconsole lodash (4.17.13), lodash.template (4.5.0), eslint-utils (1.4.1), set-value (2.0.1), and mixin-deep (1.3.2) dependencies.

- Errors from runtime before hooks no longer close the session.

- Switch prometheus metrics to use labels instead of a prefix.

build/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"



FROM golang:1.12.9-alpine3.10 as builder

FROM golang:1.13.0-alpine3.10 as builder



ARG commit

ARG version

build/pluginbuilder/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama-pluginbuilder:2.1.1

# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"



FROM golang:1.12.9-alpine3.10 as builder

FROM golang:1.13.0-alpine3.10 as builder



MAINTAINER Heroic Labs <support@heroiclabs.com>

go.mod

+9 −9
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ require ( 
	contrib.go.opencensus.io/exporter/prometheus v0.1.0

	contrib.go.opencensus.io/exporter/stackdriver v0.12.2

	github.com/RoaringBitmap/roaring v0.4.18 // indirect

	github.com/blevesearch/bleve v0.0.0-20190613153500-26d2099fa968

	github.com/blevesearch/bleve v0.0.0-20190613153557-26d2099fa968

	github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3 // indirect

	github.com/blevesearch/go-porterstemmer v1.0.2 // indirect

	github.com/blevesearch/segment v0.0.0-20160915185041-762005e7a34f // indirect
@@ -15,7 +15,7 @@ require ( 
	github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect

	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect

	github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect

	github.com/dgrijalva/jwt-go v0.0.0-20190530174800-7cd734deee98

	github.com/dgrijalva/jwt-go v0.0.0-20190530174854-7cd734deee98

	github.com/edsrzf/mmap-go v1.0.0 // indirect

	github.com/etcd-io/bbolt v1.3.3 // indirect

	github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
@@ -24,11 +24,11 @@ require ( 
	github.com/go-sql-driver/mysql v1.4.1 // indirect

	github.com/go-yaml/yaml v2.1.0+incompatible

	github.com/gobuffalo/packr v1.26.0

	github.com/gofrs/uuid v0.0.0-20190510204200-abfe1881e60e

	github.com/gofrs/uuid v0.0.0-20190510204422-abfe1881e60e

	github.com/golang/protobuf v1.3.1

	github.com/gorilla/handlers v0.0.0-20190227193400-ac6d24f88de4

	github.com/gorilla/handlers v0.0.0-20190227193432-ac6d24f88de4

	github.com/gorilla/mux v1.7.2

	github.com/gorilla/websocket v0.0.0-20190427040300-80c2d40e9b91

	github.com/gorilla/websocket v0.0.0-20190427040306-80c2d40e9b91

	github.com/grpc-ecosystem/grpc-gateway v1.9.2

	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect

	github.com/jackc/pgx v3.4.0+incompatible
@@ -37,23 +37,23 @@ require ( 
	github.com/mattn/go-sqlite3 v1.10.0 // indirect

	github.com/pkg/errors v0.8.1

	github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7 // indirect

	github.com/rubenv/sql-migrate v0.0.0-20190618074400-f4d34eae5a5c

	github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c

	github.com/satori/go.uuid v1.2.0 // indirect

	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect

	github.com/steveyen/gtreap v0.0.0-20150807155958-0abe01ef9be2 // indirect

	github.com/stretchr/testify v1.3.0

	github.com/syndtr/goleveldb v1.0.0 // indirect

	github.com/tecbot/gorocksdb v0.0.0-20190519120508-025c3cf4ffb4 // indirect

	github.com/yuin/gopher-lua v0.0.0-20190514113300-1cd887cd7036

	github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036

	github.com/ziutek/mymysql v1.5.4 // indirect

	go.etcd.io/bbolt v1.3.3 // indirect

	go.opencensus.io v0.22.0

	go.uber.org/atomic v1.4.0

	go.uber.org/multierr v1.1.0 // indirect

	go.uber.org/zap v1.10.0

	golang.org/x/crypto v0.0.0-20190617222500-ea8f1a30c443

	golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443

	golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09

	google.golang.org/genproto v0.0.0-20190611190200-a7e196e89fd3

	google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3

	google.golang.org/grpc v1.21.1

	gopkg.in/gorp.v1 v1.7.2 // indirect

	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20190411184413-94d9e492cc53

go.sum

+18 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLM 
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

github.com/blevesearch/bleve v0.0.0-20190613153500-26d2099fa968 h1:aEEQUGahj3MiNdd3ylNYiOWKvOgm+7NuEYTU7aczNJg=

github.com/blevesearch/bleve v0.0.0-20190613153500-26d2099fa968/go.mod h1:Y2lmIkzV6mcNfAnAdOd+ZxHkHchhBfU/xroGIp61wfw=

github.com/blevesearch/bleve v0.0.0-20190613153557-26d2099fa968 h1:Nlb7k138UDtkkhFh+QIBMnOX+fWQHd9Hj2PsezEgaaM=

github.com/blevesearch/bleve v0.0.0-20190613153557-26d2099fa968/go.mod h1:Y2lmIkzV6mcNfAnAdOd+ZxHkHchhBfU/xroGIp61wfw=

github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3 h1:U6vnxZrTfItfiUiYx0lf/LgHjRSfaKK5QHSom3lEbnA=

github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3/go.mod h1:WH+MU2F4T0VmSdaPX+Wu5GYoZBrYWdOZWSjzvYcDmqQ=

github.com/blevesearch/go-porterstemmer v1.0.2 h1:qe7n69gBd1OLY5sHKnxQHIbzn0LNJA4hpAf+5XDxV2I=
@@ -49,6 +51,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c 
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

github.com/dgrijalva/jwt-go v0.0.0-20190530174800-7cd734deee98 h1:Oxv4rM4DXWJpqIPgR21UUBCt6EYFdF5aJaE61dfqsd0=

github.com/dgrijalva/jwt-go v0.0.0-20190530174800-7cd734deee98/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

github.com/dgrijalva/jwt-go v0.0.0-20190530174854-7cd734deee98 h1:7RXsFiQUdrKri/1zA4K31F6R2swfoyGiYiMFrZ59H4k=

github.com/dgrijalva/jwt-go v0.0.0-20190530174854-7cd734deee98/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=

github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=

github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=
@@ -82,6 +86,8 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754 h1:tpom+2CJmpzAWj5 
github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=

github.com/gofrs/uuid v0.0.0-20190510204200-abfe1881e60e h1:5OFlg9mP4wu/NhG+woMLuwyRY3SvG7k2qVER0nj7exk=

github.com/gofrs/uuid v0.0.0-20190510204200-abfe1881e60e/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=

github.com/gofrs/uuid v0.0.0-20190510204422-abfe1881e60e h1:Jf69fp2MfjbNjd1+JWc/B0Gom5DA5Dd3wN1qLihyCXU=

github.com/gofrs/uuid v0.0.0-20190510204422-abfe1881e60e/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=

github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=

github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -104,10 +110,14 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGa 
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

github.com/gorilla/handlers v0.0.0-20190227193400-ac6d24f88de4 h1:13R0n9UbkHieClLx2lFvNvsmp56SezLH4t8l4Kfmnyg=

github.com/gorilla/handlers v0.0.0-20190227193400-ac6d24f88de4/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=

github.com/gorilla/handlers v0.0.0-20190227193432-ac6d24f88de4 h1:0Kf6Olt6OB/0z28orAeuAQ6eK4Ub8peqJ7k4wiOA2c8=

github.com/gorilla/handlers v0.0.0-20190227193432-ac6d24f88de4/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=

github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I=

github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

github.com/gorilla/websocket v0.0.0-20190427040300-80c2d40e9b91 h1:ennVDGeEjJ7jWAiYuKyUbn03CNw0+8Rx0qwYyhDVO6s=

github.com/gorilla/websocket v0.0.0-20190427040300-80c2d40e9b91/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=

github.com/gorilla/websocket v0.0.0-20190427040306-80c2d40e9b91 h1:6LmIJ1tEzp8HY6JlVw8FEuFN/JQtCteWXqME5jvOcQU=

github.com/gorilla/websocket v0.0.0-20190427040306-80c2d40e9b91/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=

github.com/grpc-ecosystem/grpc-gateway v1.9.2 h1:S+ef0492XaIknb8LMjcwgW2i3cNTzDYMmDrOThOJNWc=

github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=

github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -179,6 +189,8 @@ github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhg 
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

github.com/rubenv/sql-migrate v0.0.0-20190618074400-f4d34eae5a5c h1:D7a64hNIAYYKqFtELrXTROQ1xjvbK4S4pzegr6xUEUQ=

github.com/rubenv/sql-migrate v0.0.0-20190618074400-f4d34eae5a5c/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=

github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c h1:LCELEbde3/GT141OpHRs+jJZrI1tI3ayVd4VqW7Ui2U=

github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=

github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=

github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=

github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -214,6 +226,8 @@ github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPy 
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=

github.com/yuin/gopher-lua v0.0.0-20190514113300-1cd887cd7036 h1:qE6oKTjan9W44LGJ/nTUgGSa51IGrozhqNSwgPHtcBA=

github.com/yuin/gopher-lua v0.0.0-20190514113300-1cd887cd7036/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=

github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036 h1:1b6PAtenNyhsmo/NKXVe34h7JEZKva1YB/ne7K7mqKM=

github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=

github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=

github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=

go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
@@ -232,6 +246,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 
golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=

golang.org/x/crypto v0.0.0-20190617222500-ea8f1a30c443 h1:xJPtzRh/knq5uRWUbe2vFIiARLpMCo8e9NyEm0FsxkY=

golang.org/x/crypto v0.0.0-20190617222500-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443 h1:IcSOAf4PyMp3U3XbIEj1/xJ2BjNN2jWv7JoyOsMxXUU=

golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -292,6 +308,8 @@ google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRn 
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=

google.golang.org/genproto v0.0.0-20190611190200-a7e196e89fd3 h1:nbTgyBTyZZ5oMDDD8B2L0w38qpyTjtHXmIHVb7xOncI=

google.golang.org/genproto v0.0.0-20190611190200-a7e196e89fd3/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=

google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3 h1:0LGHEA/u5XLibPOx6D7D8FBT/ax6wT57vNKY0QckCwo=

google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=

google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=

google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=