Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update Golang in Dockerfiles #306

Merged
merged 1 commit into from
May 26, 2024
Merged

chore: update Golang in Dockerfiles #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ jobs:
exclude:
- go: 1.21
package: jaeger-influxdb
- go: 1.21
package: tests-integration
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

Expand Down Expand Up @@ -52,11 +54,11 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: "1.22"

Expand Down
2 changes: 1 addition & 1 deletion jaeger-influxdb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile:1.2
FROM golang:1.20-alpine3.16 AS builder
FROM golang:1.22-alpine3.20 AS builder
RUN apk --update --no-cache add ca-certificates
ENV CGO_ENABLED 0

Expand Down
2 changes: 1 addition & 1 deletion jaeger-influxdb/Dockerfile.all-in-one
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile:1.2
FROM golang:1.20-alpine3.16 AS builder
FROM golang:1.22-alpine3.20 AS builder
RUN apk --update --no-cache add ca-certificates
ENV CGO_ENABLED 0

Expand Down
2 changes: 1 addition & 1 deletion otelcol-influxdb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile:1.2
FROM golang:1.22-alpine3.19 AS builder
FROM golang:1.22-alpine3.20 AS builder
RUN apk --update --no-cache add ca-certificates
ENV CGO_ENABLED 0

Expand Down
6 changes: 3 additions & 3 deletions tests-integration/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module tests

go 1.21.0
go 1.22.0

toolchain go1.21.10
toolchain go1.22.3

require (
github.com/influxdata/influxdb/v2 v2.6.1
github.com/influxdata/line-protocol/v2 v2.2.1
github.com/influxdata/telegraf v1.27.2
github.com/influxdata/telegraf v0.0.0-0.20240525225432-1e4dabce191c
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.101.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.101.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.101.0
Expand Down
Loading