Skip to content

Commit

Permalink
Golang 1.22, update golangci/golangci-lint:v1.56.2-alpine, update alp…
Browse files Browse the repository at this point in the history
…ine docker base image (#882)

* golang:1.22

* bump Docker alpine image to alpine:3.19.1

* golangci-lint:v1.56.2-alpine
  • Loading branch information
oliver006 authored Feb 17, 2024
1 parent 227a050 commit e457d85
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
18 changes: 9 additions & 9 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ services:

steps:
- name: start
image: golang:1.21
image: golang:1.22
pull: if-not-exists
commands:
- sleep 10
Expand Down Expand Up @@ -153,7 +153,7 @@ steps:
- start

- name: lint
image: golangci/golangci-lint:v1.55.2-alpine
image: golangci/golangci-lint:v1.56.2-alpine
pull: if-not-exists
commands:
- golangci-lint run --tests=false --exclude-use-default
Expand All @@ -167,7 +167,7 @@ steps:
- start

- name: tests
image: golang:1.21
image: golang:1.22
pull: if-not-exists
environment:
GO111MODULE: on
Expand All @@ -186,7 +186,7 @@ steps:


- name: mixins
image: golang:1.21
image: golang:1.22
pull: if-not-exists
commands:
- make mixin
Expand All @@ -200,7 +200,7 @@ steps:


- name: coverage-codecov
image: golang:1.21
image: golang:1.22
pull: if-not-exists
environment:
CODECOV_TOKEN:
Expand All @@ -219,7 +219,7 @@ steps:


- name: coverage-coveralls
image: golang:1.21
image: golang:1.22
pull: if-not-exists
environment:
GO111MODULE: on
Expand All @@ -238,7 +238,7 @@ steps:

# this is just a smoke test if building a few different arch/OS combinations succeeds
- name: build-some-amd64-binaries
image: golang:1.21
image: golang:1.22
pull: if-not-exists
environment:
GO111MODULE: on
Expand All @@ -255,7 +255,7 @@ steps:
# this builds the binaries that get uploaded to GH for a release
# docker binaries are build in docker itself via multi-stage Docker files
- name: build-all-binaries
image: golang:1.21
image: golang:1.22
pull: if-not-exists
environment:
GO111MODULE: on
Expand Down Expand Up @@ -609,7 +609,7 @@ steps:


- name: release-github-binaries
image: golang:1.21
image: golang:1.22
pull: if-not-exists
environment:
GITHUB_TOKEN:
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker-compose-for-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:


tests:
image: golang:1.20
image: golang:1.22
working_dir: /go/src/github.com/oliver006/redis_exporter
volumes:
- ..:/go/src/github.com/oliver006/redis_exporter
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG GOARCH
#
# build container
#
FROM --platform=linux/amd64 golang:1.21-alpine as builder
FROM --platform=linux/amd64 golang:1.22-alpine as builder
WORKDIR /go/src/github.com/oliver006/redis_exporter/

ADD . /go/src/github.com/oliver006/redis_exporter/
Expand Down Expand Up @@ -36,7 +36,7 @@ ENTRYPOINT [ "/redis_exporter" ]
#
# Alpine release container
#
FROM --platform=linux/$GOARCH alpine:3.18.3 as alpine
FROM --platform=linux/$GOARCH alpine:3.19.1 as alpine

COPY --from=builder /redis_exporter /redis_exporter
COPY --from=builder /etc/ssl/certs /etc/ssl/certs
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/oliver006/redis_exporter

go 1.20
go 1.22

require (
github.com/gomodule/redigo v1.8.9
Expand Down
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws
github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
github.com/mna/redisc v1.4.0 h1:rBKXyGO/39SGmYoRKCyzXcBpoMMKqkikg8E1G8YIfSA=
Expand Down

0 comments on commit e457d85

Please sign in to comment.