Merge pull request #818 from github/fixHadolint

Fix hadolint
This commit is contained in:
Lukas Gravley 2020-10-08 09:29:05 -05:00 committed by GitHub
commit c3a73ea73e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions

View file

@ -3,3 +3,9 @@
## Hadolint config file ## ## Hadolint config file ##
########################## ##########################
ignored: ignored:
- DL4001 # Ignore wget and curl in same file
- DL4006 # ignore pipefail as we dont want to add layers
- DL3018 # We do pin version in pipfile.lock
- DL3013 # We do pin version in pipfile.lock
- DL3003 # Ignore workdir so we dont add layers
- SC2016 # ignore as its intepreted later

View file

@ -14,6 +14,7 @@ FROM golangci/golangci-lint:v1.31.0 as golangci-lint
FROM yoheimuta/protolint:v0.26.0 as protolint FROM yoheimuta/protolint:v0.26.0 as protolint
FROM koalaman/shellcheck:v0.7.1 as shellcheck FROM koalaman/shellcheck:v0.7.1 as shellcheck
FROM wata727/tflint:0.20.2 as tflint FROM wata727/tflint:0.20.2 as tflint
FROM mvdan/shfmt:v3.1.2 as shfmt
FROM accurics/terrascan:d182f1c as terrascan FROM accurics/terrascan:d182f1c as terrascan
FROM hadolint/hadolint:latest-alpine as dockerfile-lint FROM hadolint/hadolint:latest-alpine as dockerfile-lint
FROM ghcr.io/assignuser/lintr-lib:0.1.2 as lintr-lib FROM ghcr.io/assignuser/lintr-lib:0.1.2 as lintr-lib
@ -272,7 +273,7 @@ RUN CHECKSTYLE_LATEST=$(curl -s https://api.github.com/repos/checkstyle/checksty
| grep browser_download_url \ | grep browser_download_url \
| grep ".jar" \ | grep ".jar" \
| cut -d '"' -f 4) \ | cut -d '"' -f 4) \
&& curl --retry 5 --retry-delay 5 -sSL $CHECKSTYLE_LATEST \ && curl --retry 5 --retry-delay 5 -sSL "$CHECKSTYLE_LATEST" \
--output /usr/bin/checkstyle --output /usr/bin/checkstyle
#################### ####################
@ -313,14 +314,7 @@ COPY --from=kubeval /kubeval /usr/bin/
################# #################
# Install shfmt # # Install shfmt #
################# #################
ENV GO111MODULE=on \ COPY --from=shfmt /bin/shfmt /usr/bin/
GOROOT=/usr/lib/go \
GOPATH=/go
ENV PATH="$PATH":"$GOROOT"/bin:"$GOPATH"/bin
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
RUN go get mvdan.cc/sh/v3/cmd/shfmt
############################# #############################
# Copy scripts to container # # Copy scripts to container #