diff --git a/.github/workflows/image_base.yml b/.github/workflows/image_base.yml index 3f372d60a..f52917b93 100644 --- a/.github/workflows/image_base.yml +++ b/.github/workflows/image_base.yml @@ -78,6 +78,8 @@ jobs: with: context: ./ push: true + pull: true + no-cache: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: ${{ inputs.platforms || 'linux/amd64' }} diff --git a/build b/build index 9c3116089..32d9de2fb 100755 --- a/build +++ b/build @@ -318,6 +318,6 @@ docker run --rm -i \ -e "RUNTIME_DOCKERFILE=$RUNTIME_DOCKERFILE" \ --workdir /src \ --entrypoint go \ - golang:1.24-bullseye \ + golang:1.26.10-bookworm \ run utils/docker/main.go \ -i Dockerfile.tmpl -client "$CLIENT_DIST" | build_image $BASE_IMAGE -f - . diff --git a/server/Dockerfile b/server/Dockerfile index 1d309e97b..1bcdb24af 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_IMAGE=debian:bullseye-slim -FROM golang:1.25.0 AS go-toolchain +FROM golang:1.26.10 AS go-toolchain FROM $BASE_IMAGE AS server COPY --from=go-toolchain /usr/local/go /usr/local/go diff --git a/server/Dockerfile.bookworm b/server/Dockerfile.bookworm index 552880080..4e1d0bffc 100644 --- a/server/Dockerfile.bookworm +++ b/server/Dockerfile.bookworm @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=golang:1.25-bookworm +ARG BASE_IMAGE=golang:1.26.10-bookworm FROM $BASE_IMAGE AS server WORKDIR /src diff --git a/server/go.mod b/server/go.mod index a4e482be7..b72524444 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,6 +1,6 @@ module github.com/m1k1o/neko/server -go 1.25.0 +go 1.26.10 require ( github.com/PaesslerAG/gval v1.2.4