Skip to content

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
brocaar committed Dec 10, 2020
1 parent 91e8234 commit 6abc1bb
Show file tree
Hide file tree
Showing 6 changed files with 456 additions and 75 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14-alpine AS development
FROM golang:1.15-alpine AS development

ENV PROJECT_PATH=/chirpstack-gateway-bridge
ENV PATH=$PATH:$PROJECT_PATH/build
Expand All @@ -14,7 +14,7 @@ WORKDIR $PROJECT_PATH
RUN make dev-requirements
RUN make

FROM alpine:3.11.2 AS production
FROM alpine:3 AS production

RUN apk --no-cache add ca-certificates
COPY --from=development /chirpstack-gateway-bridge/build/chirpstack-gateway-bridge /usr/bin/chirpstack-gateway-bridge
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-devel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14-alpine
FROM golang:1.15-alpine

ENV PROJECT_PATH=/chirpstack-gateway-bridge
ENV PATH=$PATH:$PROJECT_PATH/build
Expand Down
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.PHONY: build clean test package serve run-compose-test
PKGS := $(shell go list ./... | grep -v /vendor/)
VERSION := $(shell git describe --always |sed -e "s/^v//")

build:
Expand All @@ -15,11 +14,9 @@ clean:
test:
@echo "Running tests"
@rm -f coverage.out
@for pkg in $(PKGS) ; do \
golint $$pkg ; \
done
@go vet $(PKGS)
@go test -cover -v $(PKGS) -coverprofile coverage.out
@golint ./...
@go vet ./...
@go test -cover -v -coverprofile coverage.out -p 1 ./...

dist:
@goreleaser
Expand Down
46 changes: 28 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,32 +1,42 @@
module github.com/brocaar/chirpstack-gateway-bridge

go 1.14
go 1.15

require (
github.com/brocaar/chirpstack-api/go/v3 v3.6.0
github.com/brocaar/lorawan v0.0.0-20190814113539-8eb2a8d6da09
github.com/brocaar/chirpstack-api/go/v3 v3.8.1
github.com/brocaar/lorawan v0.0.0-20201030140234-f23da2d4a303
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/eclipse/paho.mqtt.golang v1.2.0
github.com/eclipse/paho.mqtt.golang v1.3.0
github.com/go-zeromq/zmq4 v0.7.0
github.com/gofrs/uuid v3.2.0+incompatible
github.com/golang/protobuf v1.3.5
github.com/gofrs/uuid v3.3.0+incompatible
github.com/golang/protobuf v1.4.3
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
github.com/goreleaser/goreleaser v0.106.0
github.com/goreleaser/nfpm v0.11.0
github.com/gorilla/websocket v1.4.1
github.com/gorilla/websocket v1.4.2
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/magiconair/properties v1.8.4 // indirect
github.com/mitchellh/mapstructure v1.4.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v1.1.0
github.com/sirupsen/logrus v1.4.2
github.com/pelletier/go-toml v1.8.1 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.8.0
github.com/prometheus/common v0.15.0 // indirect
github.com/sirupsen/logrus v1.7.0
github.com/smartystreets/assertions v1.0.0 // indirect
github.com/spf13/afero v1.2.0 // indirect
github.com/spf13/cobra v0.0.5
github.com/spf13/viper v1.4.0
github.com/spf13/afero v1.5.1 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.1.1
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.4.0
golang.org/x/lint v0.0.0-20190409202823-959b441ac422
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
golang.org/x/tools v0.0.0-20190709211700-7b25e351ac0e // indirect
google.golang.org/appengine v1.6.1 // indirect
golang.org/x/lint v0.0.0-20190930215403-16217165b5de
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 // indirect
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d // indirect
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit 6abc1bb

Please sign in to comment.