diff --git a/Dockerfile b/Dockerfile index 3af630766..3a35da441 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # container for this image, the desired binary must be specified (either # /usr/bin/core-service or /usr/bin/db-manager). -FROM golang:1.25-alpine AS build +FROM golang:1.26-alpine AS build ARG EXTRA_GO_INSTALL_FLAGS="" ENV EXTRA_GO_INSTALL_FLAGS=${EXTRA_GO_INSTALL_FLAGS} diff --git a/Makefile b/Makefile index f44144fd9..dcb026132 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ shell-lint: .PHONY: go-lint go-lint: - echo "===== Checking Go lint (except for *.gen.go files) =====" && docker run --rm -v $(CURDIR):/dss -w /dss golangci/golangci-lint:v2.7.2 golangci-lint run -v + echo "===== Checking Go lint (except for *.gen.go files) =====" && docker run --rm -v $(CURDIR):/dss -w /dss golangci/golangci-lint:v2.12.2 golangci-lint run -v .PHONY: terraform-lint terraform-lint: diff --git a/build/test-certs/Dockerfile b/build/test-certs/Dockerfile index 288541662..45d742285 100644 --- a/build/test-certs/Dockerfile +++ b/build/test-certs/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25-alpine +FROM golang:1.26-alpine WORKDIR /go/src/app diff --git a/cmds/dummy-oauth/Dockerfile b/cmds/dummy-oauth/Dockerfile index c7f527478..d7b1c81af 100644 --- a/cmds/dummy-oauth/Dockerfile +++ b/cmds/dummy-oauth/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25-alpine AS build +FROM golang:1.26-alpine AS build RUN apk add git bash make RUN mkdir /app WORKDIR /app diff --git a/go.mod b/go.mod index ec2c4897b..cd39dc432 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/interuss/dss -go 1.25.5 +go 1.26.2 require ( cloud.google.com/go/profiler v0.4.0 diff --git a/interfaces/openapi-to-go-server/example/Dockerfile b/interfaces/openapi-to-go-server/example/Dockerfile index 057ed1eaf..c1966580b 100644 --- a/interfaces/openapi-to-go-server/example/Dockerfile +++ b/interfaces/openapi-to-go-server/example/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25-alpine +FROM golang:1.26-alpine WORKDIR /go/src/server_demo COPY . .