diff --git a/.circleci/config.yml b/.circleci/config.yml index ee71c36..5a2ce03 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,19 +2,19 @@ alias: default: &default working_directory: /go/src/github.com/yahoojapan/ngtd docker: - - image: circleci/golang:1.12 + - image: circleci/golang:1.12.5 environment: GOPATH: "/go" GO111MODULE: "on" LD_LIBRARY_PATH: /usr/local/lib - NGT_VERSION: 1.7.0 + NGT_VERSION: 1.7.3 REPO_NAME: "yahoojapan" IMAGE_NAME: "ngtd" GITHUB_API: "https://api.github.com/" DOCKER_USER: "kpango" - image: redis setup_remote_docker: &setup_remote_docker - version: 18.06.0-ce + version: 18.09.3 docker_layer_caching: true version: 2 diff --git a/Dockerfile b/Dockerfile index 4c00d39..d8d6098 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM ubuntu:latest AS builder ENV APP_NAME ngtd -ENV NGT_VERSION 1.7.1 +ENV NGT_VERSION 1.7.3 ENV DEBIAN_FRONTEND noninteractive ENV INITRD No ENV LANG ja_JP.UTF-8 -ENV GOVERSION 1.12.1 +ENV GOVERSION 1.12.5 ENV GOROOT /opt/go ENV GOPATH /go diff --git a/go.mod b/go.mod index c6eb4a8..5744efa 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,10 @@ require ( github.com/go-redis/redis v6.15.2+incompatible github.com/golang/protobuf v1.3.1 github.com/gorilla/mux v1.7.1 - github.com/kpango/glg v1.3.2 + github.com/kpango/glg v1.4.1 github.com/syndtr/goleveldb v1.0.0 - github.com/yahoojapan/gongt v0.0.0-20190424070148-2f725a1c307d - golang.org/x/net v0.0.0-20190424024845-afe8014c977f + github.com/yahoojapan/gongt v0.0.0-20190510074919-8d5ef068361d + golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 golang.org/x/sync v0.0.0-20190423024810-112230192c58 google.golang.org/grpc v1.20.1 gopkg.in/urfave/cli.v1 v1.20.0 diff --git a/go.sum b/go.sum index a88e30f..28da349 100644 --- a/go.sum +++ b/go.sum @@ -16,24 +16,23 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/gorilla/mux v1.7.1 h1:Dw4jY2nghMMRsh1ol8dv1axHkDwMQK2DHerMNJsIpJU= github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/kpango/fastime v1.0.8 h1:Wif5eocdsIXmMG+8HHfRP/jD6UUl+/OVTJ+sMzvA1+E= -github.com/kpango/fastime v1.0.8/go.mod h1:Y5XY5bLG5yc7g2XmMUzc22XYV1XaH+KgUOHkDvLp4SA= -github.com/kpango/glg v1.3.0/go.mod h1:7zzaAoMqvngad+sagWLjr00EQMJaqyGONdg0WYBAO3M= -github.com/kpango/glg v1.3.2 h1:daEbLGtRspX5MYne4ppkl2StRN/hc8hE+ntnu38tsOI= -github.com/kpango/glg v1.3.2/go.mod h1:7zzaAoMqvngad+sagWLjr00EQMJaqyGONdg0WYBAO3M= +github.com/kpango/fastime v1.0.9 h1:GZ7WtFFpTCq8aPXAM+AxKZ1MtNYc22fTpEp4tPKuiKI= +github.com/kpango/fastime v1.0.9/go.mod h1:lVqUTcXmQnk1wriyvq5DElbRSRDC0XtqbXQRdz0Eo+g= +github.com/kpango/glg v1.4.1 h1:2Lk6AAmmM0bsPy8XCKwjfjKFCznJk6xRn6AJlr2R0/E= +github.com/kpango/glg v1.4.1/go.mod h1:YM6wQXx2ktVPw7qf5UQUg2y29lub0KZ46L3zI3O1IiA= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/yahoojapan/gongt v0.0.0-20190424070148-2f725a1c307d h1:YkVOWNF+8/n8G435jl1dZSV0EShqi5teAmutwmXs0+c= -github.com/yahoojapan/gongt v0.0.0-20190424070148-2f725a1c307d/go.mod h1:t+18dG3a4an14F0wj/fkSdROjODEN7405sla9IPjuUo= +github.com/yahoojapan/gongt v0.0.0-20190510074919-8d5ef068361d h1:9AW+pZEEeEwzmXszOpOXSX9jWGAeevYA4EyiBntiNlc= +github.com/yahoojapan/gongt v0.0.0-20190510074919-8d5ef068361d/go.mod h1:A2SfG3IwaM8xpwJ8LDD+tK7K1USXdDX0uF4jkWYwgI0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190424024845-afe8014c977f h1:uALRiwYevCJtciRa4mKKFkrs5jY4F2OTf1D2sfi1swY= -golang.org/x/net v0.0.0-20190424024845-afe8014c977f/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 h1:6M3SDHlHHDCx2PcQw3S4KsR170vGqDhJDOmpVd4Hjak= +golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=