Skip to content

Commit 6abc1bb

Browse files
committed
Update dependencies.
1 parent 91e8234 commit 6abc1bb

File tree

6 files changed

+456
-75
lines changed

6 files changed

+456
-75
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14-alpine AS development
1+
FROM golang:1.15-alpine AS development
22

33
ENV PROJECT_PATH=/chirpstack-gateway-bridge
44
ENV PATH=$PATH:$PROJECT_PATH/build
@@ -14,7 +14,7 @@ WORKDIR $PROJECT_PATH
1414
RUN make dev-requirements
1515
RUN make
1616

17-
FROM alpine:3.11.2 AS production
17+
FROM alpine:3 AS production
1818

1919
RUN apk --no-cache add ca-certificates
2020
COPY --from=development /chirpstack-gateway-bridge/build/chirpstack-gateway-bridge /usr/bin/chirpstack-gateway-bridge

Dockerfile-devel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14-alpine
1+
FROM golang:1.15-alpine
22

33
ENV PROJECT_PATH=/chirpstack-gateway-bridge
44
ENV PATH=$PATH:$PROJECT_PATH/build

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.PHONY: build clean test package serve run-compose-test
2-
PKGS := $(shell go list ./... | grep -v /vendor/)
32
VERSION := $(shell git describe --always |sed -e "s/^v//")
43

54
build:
@@ -15,11 +14,9 @@ clean:
1514
test:
1615
@echo "Running tests"
1716
@rm -f coverage.out
18-
@for pkg in $(PKGS) ; do \
19-
golint $$pkg ; \
20-
done
21-
@go vet $(PKGS)
22-
@go test -cover -v $(PKGS) -coverprofile coverage.out
17+
@golint ./...
18+
@go vet ./...
19+
@go test -cover -v -coverprofile coverage.out -p 1 ./...
2320

2421
dist:
2522
@goreleaser

go.mod

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,42 @@
11
module github.com/brocaar/chirpstack-gateway-bridge
22

3-
go 1.14
3+
go 1.15
44

55
require (
6-
github.com/brocaar/chirpstack-api/go/v3 v3.6.0
7-
github.com/brocaar/lorawan v0.0.0-20190814113539-8eb2a8d6da09
6+
github.com/brocaar/chirpstack-api/go/v3 v3.8.1
7+
github.com/brocaar/lorawan v0.0.0-20201030140234-f23da2d4a303
88
github.com/dgrijalva/jwt-go v3.2.0+incompatible
9-
github.com/eclipse/paho.mqtt.golang v1.2.0
9+
github.com/eclipse/paho.mqtt.golang v1.3.0
1010
github.com/go-zeromq/zmq4 v0.7.0
11-
github.com/gofrs/uuid v3.2.0+incompatible
12-
github.com/golang/protobuf v1.3.5
11+
github.com/gofrs/uuid v3.3.0+incompatible
12+
github.com/golang/protobuf v1.4.3
1313
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
1414
github.com/goreleaser/goreleaser v0.106.0
1515
github.com/goreleaser/nfpm v0.11.0
16-
github.com/gorilla/websocket v1.4.1
16+
github.com/gorilla/websocket v1.4.2
1717
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 // indirect
18-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
18+
github.com/magiconair/properties v1.8.4 // indirect
19+
github.com/mitchellh/mapstructure v1.4.0 // indirect
1920
github.com/patrickmn/go-cache v2.1.0+incompatible
20-
github.com/pkg/errors v0.8.1
21-
github.com/prometheus/client_golang v1.1.0
22-
github.com/sirupsen/logrus v1.4.2
21+
github.com/pelletier/go-toml v1.8.1 // indirect
22+
github.com/pkg/errors v0.9.1
23+
github.com/prometheus/client_golang v1.8.0
24+
github.com/prometheus/common v0.15.0 // indirect
25+
github.com/sirupsen/logrus v1.7.0
2326
github.com/smartystreets/assertions v1.0.0 // indirect
24-
github.com/spf13/afero v1.2.0 // indirect
25-
github.com/spf13/cobra v0.0.5
26-
github.com/spf13/viper v1.4.0
27+
github.com/spf13/afero v1.5.1 // indirect
28+
github.com/spf13/cast v1.3.1 // indirect
29+
github.com/spf13/cobra v1.1.1
30+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
31+
github.com/spf13/viper v1.7.1
2732
github.com/stretchr/testify v1.4.0
28-
golang.org/x/lint v0.0.0-20190409202823-959b441ac422
29-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
30-
golang.org/x/tools v0.0.0-20190709211700-7b25e351ac0e // indirect
31-
google.golang.org/appengine v1.6.1 // indirect
33+
golang.org/x/lint v0.0.0-20190930215403-16217165b5de
34+
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 // indirect
35+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
36+
golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d // indirect
37+
golang.org/x/text v0.3.4 // indirect
38+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
39+
google.golang.org/protobuf v1.25.0 // indirect
40+
gopkg.in/ini.v1 v1.62.0 // indirect
41+
gopkg.in/yaml.v2 v2.4.0 // indirect
3242
)

0 commit comments

Comments
 (0)