diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f227578..a82545d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,12 +32,12 @@ jobs: env: BUILD_TAGS: kube,e2e run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin/ v1.37.0 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin/ v1.39.0 make -f builder.Makefile lint # only on main branch, costs too much for the gain on every PR validate-cross-build: - name: Validate cros build + name: Validate cross build runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' env: diff --git a/Dockerfile b/Dockerfile index 1d958457..a6ea9e02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:experimental +# syntax=docker/dockerfile:1.2 # Copyright 2020 Docker Compose CLI authors @@ -16,13 +16,12 @@ # limitations under the License. ARG GO_VERSION=1.16-alpine -ARG GOLANGCI_LINT_VERSION=v1.37.0-alpine +ARG GOLANGCI_LINT_VERSION=v1.39.0-alpine ARG PROTOC_GEN_GO_VERSION=v1.4.3 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base WORKDIR /compose-cli -ENV GO111MODULE=on -RUN apk add --no-cache \ +RUN apk add --no-cache -vv \ git \ docker \ make \