tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <christopher.crone@docker.com>
This commit is contained in:
Chris Crone 2021-04-13 15:19:20 +02:00
parent 74773b9062
commit a12b1dcea0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -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:

7
Dockerfile
View File

@ -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 \