diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5d19887..b497dbb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: - go-version: 1.21.x + go-version: 1.22.x cache: false - uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc diff --git a/.github/workflows/release-tagged.yml b/.github/workflows/release-tagged.yml index e4daef0..1c5fc2b 100644 --- a/.github/workflows/release-tagged.yml +++ b/.github/workflows/release-tagged.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: - go-version: 1.21.x + go-version: 1.22.x - name: Set up Docker Buildx uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51ca422..8fd63ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: - go-version: 1.21.x + go-version: 1.22.x cache: true - name: test diff --git a/.tool-versions b/.tool-versions index d70ca2f..f526442 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.21.3 +golang 1.22.0 diff --git a/go.mod b/go.mod index 7f39e92..8dcacb2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pomerium/datasource -go 1.21 +go 1.22 require ( github.com/aws/aws-sdk-go-v2 v1.24.1 diff --git a/pomerium-datasource-ip2location.dockerfile b/pomerium-datasource-ip2location.dockerfile index 0f598a8..8f8f4b0 100644 --- a/pomerium-datasource-ip2location.dockerfile +++ b/pomerium-datasource-ip2location.dockerfile @@ -9,7 +9,7 @@ RUN --mount=type=secret,id=download_token \ -o /download/IP2LOCATION-LITE-DB1.CSV.ZIP \ "https://www.ip2location.com/download/?token=${DOWNLOAD_TOKEN}&file=DB1LITECSV" -FROM golang:1.21.6-bookworm@sha256:3efef61ff1d99c8a90845100e2a7e934b4a5d11b639075dc605ff53c141044fc as build +FROM golang:1.22.0-bookworm@sha256:925fe3fa28ba428cf67a7947ae838f8a1523117b40e3e6b5106c378e3f97fa29 as build WORKDIR /build diff --git a/pomerium-datasource.dockerfile b/pomerium-datasource.dockerfile index 3b1d6d4..0ac3d78 100644 --- a/pomerium-datasource.dockerfile +++ b/pomerium-datasource.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6-bookworm@sha256:3efef61ff1d99c8a90845100e2a7e934b4a5d11b639075dc605ff53c141044fc as build +FROM golang:1.22.0-bookworm@sha256:925fe3fa28ba428cf67a7947ae838f8a1523117b40e3e6b5106c378e3f97fa29 as build WORKDIR /build