Skip to content

Commit

Permalink
update go deps and use go 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
waynz0r committed Apr 8, 2022
1 parent 9b6e1e3 commit 8d9b133
Show file tree
Hide file tree
Showing 7 changed files with 599 additions and 566 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2.1

orbs:
docker: banzaicloud/docker@0.0.5
docker: banzaicloud/docker@0.0.7

jobs:
build:
docker:
- image: circleci/golang:1.13
- image: circleci/golang:1.16
environment:
GOFLAGS: -mod=readonly
steps:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG GO_VERSION=1.17.2
ARG GO_VERSION=1.18.0

FROM golang:${GO_VERSION}-alpine3.13 AS builder
FROM golang:${GO_VERSION}-alpine3.15 AS builder

RUN apk add --update --no-cache ca-certificates~=20191127 make~=4.3 git~=2.30 curl~=7.79
RUN apk add --update --no-cache ca-certificates~=20211220 make~=4.3 git~=2.34 curl~=7.80

ARG PACKAGE=/build

Expand Down
9 changes: 2 additions & 7 deletions Dockerfile.local
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM alpine:3.13.6 AS builder
FROM alpine:3.15.4

RUN apk add --update --no-cache ca-certificates~=20191127 bash~=5.1 curl~=7.79


FROM alpine:3.13.6

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
RUN apk add --update --no-cache ca-certificates~=20211220

ARG BUILD_DIR
ARG BINARY_NAME
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ endif
DOCKER_TAG ?= ${VERSION}

# Dependency versions
GOLANGCI_VERSION = 1.43.0
GOLANG_VERSION = 1.17
GOLANGCI_VERSION = 1.45.0
GOLANG_VERSION = 1.18
LICENSEI_VERSION = 0.3.1

# Add the ability to override some variables
Expand Down Expand Up @@ -103,12 +103,14 @@ bin/golangci-lint: bin/golangci-lint-${GOLANGCI_VERSION}
@ln -sf golangci-lint-${GOLANGCI_VERSION} bin/golangci-lint
bin/golangci-lint-${GOLANGCI_VERSION}:
@mkdir -p bin
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b ./bin/ v${GOLANGCI_VERSION}
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/v${GOLANGCI_VERSION}/install.sh | bash -s -- -b ./bin/ v${GOLANGCI_VERSION}
@mv bin/golangci-lint $@

.PHONY: lint
lint: bin/golangci-lint ## Run linter
bin/golangci-lint run
# "unused" linter is a memory hog, but running it separately keeps it contained (probably because of caching)
bin/golangci-lint run --disable=unused -c .golangci.yml --timeout 2m
bin/golangci-lint run -c .golangci.yml --timeout 2m

bin/licensei: bin/licensei-${LICENSEI_VERSION}
@ln -sf licensei-${LICENSEI_VERSION} bin/licensei
Expand Down
84 changes: 43 additions & 41 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,60 +1,62 @@
module github.com/banzaicloud/allspark

go 1.17
go 1.18

require (
emperror.dev/emperror v0.21.3
emperror.dev/errors v0.4.1
github.com/gin-gonic/gin v1.7.0
github.com/go-mysql-org/go-mysql v1.3.0
github.com/golang/protobuf v1.3.3
github.com/google/uuid v1.1.1
github.com/goph/logur v0.11.0
github.com/jackc/pgx/v4 v4.11.0
emperror.dev/emperror v0.33.0
emperror.dev/errors v0.8.1
github.com/gin-gonic/gin v1.7.7
github.com/go-mysql-org/go-mysql v1.4.0
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.3.0
github.com/jackc/pgx/v4 v4.15.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.4.2
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.3.1
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
google.golang.org/grpc v1.26.0
gopkg.in/yaml.v2 v2.2.8
github.com/sirupsen/logrus v1.8.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.10.1
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3
google.golang.org/grpc v1.45.0
gopkg.in/yaml.v2 v2.4.0
logur.dev/logur v0.17.0
)

require (
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.13.0 // indirect
github.com/go-playground/universal-translator v0.17.0 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.10.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.8.1 // indirect
github.com/jackc/pgconn v1.11.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.0.6 // indirect
github.com/jackc/pgproto3/v2 v2.2.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.7.0 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/leodido/go-urn v1.2.0 // indirect
github.com/magiconair/properties v1.8.0 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/jackc/pgtype v1.10.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 // indirect
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 // indirect
github.com/spf13/afero v1.1.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/ugorji/go/codec v1.1.7 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
github.com/siddontang/go-log v0.0.0-20190221022429-1e957dd83bed // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
)
Loading

0 comments on commit 8d9b133

Please sign in to comment.