Skip to content

Commit

Permalink
Merge pull request #50 from ricoberger/update-go-and-docker-image
Browse files Browse the repository at this point in the history
Update Go and Docker Image
  • Loading branch information
ricoberger authored Apr 30, 2022
2 parents 59bf85f + 8edd55c commit c4cc5d8
Show file tree
Hide file tree
Showing 5 changed files with 347 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-20.04
name: Release
steps:
- name: Set up Go 1.17
- name: Set up Go 1.18
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-20.04
name: Test
steps:
- name: Set up Go 1.17
- name: Set up Go 1.18
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17-alpine3.14 as build
FROM golang:1.18.1-alpine3.15 as build

RUN apk add --no-cache --update git make

Expand All @@ -8,7 +8,7 @@ COPY . .
RUN make build


FROM alpine:3.14
FROM alpine:3.15.4

LABEL maintainer="Rico Berger"
LABEL git.url="https://github.com/ricoberger/script_exporter"
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/ricoberger/script_exporter

go 1.17
go 1.18

require (
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/prometheus/client_golang v1.11.0
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1
github.com/prometheus/client_golang v1.12.1
golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
google.golang.org/protobuf v1.26.0-rc.1 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
google.golang.org/protobuf v1.26.0 // indirect
)
Loading

0 comments on commit c4cc5d8

Please sign in to comment.