Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit a12b1dc

Browse files
committed
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]>
1 parent 74773b9 commit a12b1dc

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
env:
3333
BUILD_TAGS: kube,e2e
3434
run: |
35-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin/ v1.37.0
35+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin/ v1.39.0
3636
make -f builder.Makefile lint
3737
3838
# only on main branch, costs too much for the gain on every PR
3939
validate-cross-build:
40-
name: Validate cros build
40+
name: Validate cross build
4141
runs-on: ubuntu-latest
4242
if: github.ref == 'refs/heads/main'
4343
env:

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:experimental
1+
# syntax=docker/dockerfile:1.2
22

33

44
# Copyright 2020 Docker Compose CLI authors
@@ -16,13 +16,12 @@
1616
# limitations under the License.
1717

1818
ARG GO_VERSION=1.16-alpine
19-
ARG GOLANGCI_LINT_VERSION=v1.37.0-alpine
19+
ARG GOLANGCI_LINT_VERSION=v1.39.0-alpine
2020
ARG PROTOC_GEN_GO_VERSION=v1.4.3
2121

2222
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
2323
WORKDIR /compose-cli
24-
ENV GO111MODULE=on
25-
RUN apk add --no-cache \
24+
RUN apk add --no-cache -vv \
2625
git \
2726
docker \
2827
make \

0 commit comments

Comments
 (0)