Skip to content

Commit

Permalink
fix: Docker go version 1.23
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasHiltl committed Oct 26, 2024
1 parent 017bcbb commit ba8b996
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Set up Go 1.22.2
- name: Set up Go 1.23
uses: actions/setup-go@v1
with:
go-version: 1.22.2
go-version: 1.23
id: go

- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Non alpine because of CGO glibc dependency
FROM golang:1.22 AS builder
FROM golang:1.23 AS builder

WORKDIR /build
ENV CGO_ENABLED=1
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.litefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Non alpine because of CGO glibc dependency
FROM golang:1.22 AS builder
FROM golang:1.23 AS builder

WORKDIR /build
ENV CGO_ENABLED=1
Expand All @@ -11,7 +11,7 @@ COPY . .
RUN go build -buildvcs=false -ldflags "-s -w -extldflags '-static'" -o ./openchangelog cmd/server.go

# Build goose binary
FROM golang:1.22 AS goose_builder
FROM golang:1.23 AS goose_builder

WORKDIR /build

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.sqlite
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Non alpine because of CGO glibc dependency
FROM golang:1.22 AS builder
FROM golang:1.23 AS builder

WORKDIR /build
ENV CGO_ENABLED=1
Expand All @@ -11,7 +11,7 @@ COPY . .
RUN go build -buildvcs=false -ldflags "-s -w -extldflags '-static'" -o ./openchangelog cmd/server.go

# Build goose binary
FROM golang:1.22 AS goose_builder
FROM golang:1.23 AS goose_builder

WORKDIR /build

Expand Down
8 changes: 7 additions & 1 deletion apitypes/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@ module github.com/jonashiltl/openchangelog/apitypes

go 1.22.2

require github.com/guregu/null/v5 v5.0.0
require github.com/stretchr/testify v1.9.0

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
12 changes: 10 additions & 2 deletions apitypes/go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
github.com/guregu/null/v5 v5.0.0 h1:PRxjqyOekS11W+w/7Vfz6jgJE/BCwELWtgvOJzddimw=
github.com/guregu/null/v5 v5.0.0/go.mod h1:SjupzNy+sCPtwQTKWhUCqjhVCO69hpsl2QsZrWHjlwU=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 comments on commit ba8b996

Please sign in to comment.