Merge pull request #2220 from milas/go-1.19

build: upgrade to Go 1.19 & build tweaks

Author: milas

.github/workflows/aci-tests.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.19
 
 jobs:
   check-optional-tests:

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.19
 
 jobs:
   lint:
@@ -30,7 +30,7 @@ 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.45.2
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin/ v1.50.1
           make -f builder.Makefile lint
 
   # only on main branch, costs too much for the gain on every PR

.github/workflows/cli-release.yaml

@@ -12,7 +12,7 @@ on:
         default: 'true'
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.19
 
 jobs:
   release:

.github/workflows/ecs-tests.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.19
 
 jobs:
   check-optional-tests:

.github/workflows/kube-tests.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.19
 
 jobs:
   check-optional-tests:

.github/workflows/windows-ci.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.19
 
 jobs:
   check-optional-tests:

.golangci.yml

@@ -6,30 +6,28 @@ linters:
   enable-all: false
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gocyclo
     - gofmt
     - goimports
-    - revive
     - gosimple
     - govet
     - ineffassign
     - lll
     - misspell
     - nakedret
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
 linters-settings:
   gocyclo:
     min-complexity: 16
   lll:
     line-length: 200
+  goimports:
+    local-prefixes: github.com/docker/compose-cli
 issues:
   # golangci hides some golint warnings (the warning about exported things
   # withtout documentation for example), this will make it show them anyway.

Dockerfile

@@ -1,5 +1,4 @@
-# syntax=docker/dockerfile:1.2
-
+# syntax=docker/dockerfile:1
 
 #   Copyright 2020 Docker Compose CLI authors
 
@@ -15,8 +14,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-ARG GO_VERSION=1.18-alpine
-ARG GOLANGCI_LINT_VERSION=v1.45.2-alpine
+ARG GO_VERSION=1.19-alpine
+ARG GOLANGCI_LINT_VERSION=v1.50.1-alpine
 ARG PROTOC_GEN_GO_VERSION=v1.5.2
 
 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
@@ -43,7 +42,7 @@ FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS lint-base
 FROM base AS lint
 ENV GOFLAGS="-buildvcs=false"
 ENV CGO_ENABLED=0
-COPY --from=lint-base /usr/bin/golangci-lint /usr/bin/golangci-lint
+COPY --from=lint-base --link /usr/bin/golangci-lint /usr/bin/golangci-lint
 ARG BUILD_TAGS
 ARG GIT_TAG
 RUN --mount=target=. \
@@ -89,13 +88,13 @@ RUN --mount=target=. \
     make BINARY=/out/docker -f builder.Makefile cross
 
 FROM scratch AS protos
-COPY --from=make-protos /compose-cli/cli/server/protos .
+COPY --from=make-protos --link /compose-cli/cli/server/protos .
 
 FROM scratch AS cli
-COPY --from=make-cli /out/* .
+COPY --from=make-cli --link /out/* .
 
 FROM scratch AS cross
-COPY --from=make-cross /out/* .
+COPY --from=make-cross --link /out/* .
 
 FROM base AS test
 ENV CGO_ENABLED=0
@@ -120,9 +119,11 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     go mod tidy
 
 FROM scratch AS go-mod-tidy
-COPY --from=make-go-mod-tidy /compose-cli/go.mod .
-COPY --from=make-go-mod-tidy /compose-cli/go.sum .
+COPY --from=make-go-mod-tidy --link /compose-cli/go.mod .
+COPY --from=make-go-mod-tidy --link /compose-cli/go.sum .
 
 FROM base AS check-go-mod
 COPY . .
-RUN make -f builder.Makefile check-go-mod
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    make -f builder.Makefile check-go-mod

aci/backend_test.go

@@ -23,9 +23,10 @@ import (
 	"github.com/stretchr/testify/mock"
 	"gotest.tools/v3/assert"
 
+	"golang.org/x/oauth2"
+
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/containers"
-	"golang.org/x/oauth2"
 )
 
 func TestGetContainerName(t *testing.T) {

aci/compose.go

@@ -22,11 +22,12 @@ import (
 	"net/http"
 
 	"github.com/compose-spec/compose-go/types"
-	"github.com/docker/compose-cli/utils"
 	"github.com/docker/compose/v2/pkg/api"
 	"github.com/docker/compose/v2/pkg/progress"
 	"github.com/sirupsen/logrus"
 
+	"github.com/docker/compose-cli/utils"
+
 	"github.com/docker/compose-cli/aci/convert"
 	"github.com/docker/compose-cli/aci/login"
 	"github.com/docker/compose-cli/api/context/store"