Просмотр исходного кода

build: Bump linter, minor fixes

* Bump linter to 1.39.0
* Use dockerfile:1.2 syntax instead of experimental
* Fix typo in GitHub Actions

Signed-off-by: Chris Crone <[email protected]>
Chris Crone 4 лет назад
Родитель
Сommit
a12b1dcea0
2 измененных файлов с 5 добавлено и 6 удалено
  1. 2 2
      .github/workflows/ci.yml
  2. 3 4
      Dockerfile

+ 2 - 2
.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:

+ 3 - 4
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 \