Skip to content

Commit 4c149d7

Browse files
echoixechoix
committed
Run ./build.sh after rebase
1 parent 3ac4086 commit 4c149d7

File tree

91 files changed

+119
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+119
-32
lines changed

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ RUN apk add --update --no-cache \
109109
composer \
110110
dpkg \
111111
py3-pyflakes \
112-
go \
113112
nodejs \
114113
npm \
115114
yarn \
@@ -461,7 +460,8 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
461460

462461
# golangci-lint installation
463462
&& wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh \
464-
&& golangci-lint --version \
463+
&& golangci-lint --version
464+
465465

466466
# revive installation
467467
# Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive

‎flavors/cupcake/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
333333

334334
# golangci-lint installation
335335
&& wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh \
336-
&& golangci-lint --version \
336+
&& golangci-lint --version
337+
337338

338339
# revive installation
339340
# Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive
@@ -379,7 +380,8 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
379380
&& tar xf ${ML_THIRD_PARTY_DIR}/kubeconform-linux-amd64.tar.gz --directory ${ML_THIRD_PARTY_DIR} \
380381
&& mv ${ML_THIRD_PARTY_DIR}/kubeconform /usr/local/bin \
381382
&& rm ${ML_THIRD_PARTY_DIR}/kubeconform-linux-amd64.tar.gz \
382-
&& find ${ML_THIRD_PARTY_DIR} -type f -not -name 'LICENSE*' -delete -o -type d -empty -delete \
383+
&& find ${ML_THIRD_PARTY_DIR} -type f -not -name 'LICENSE*' -delete -o -type d -empty -delete
384+
383385

384386
# checkmake installation
385387
# Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake

‎flavors/documentation/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ RUN apk add --update --no-cache \
6161
openssh \
6262
openjdk11 \
6363
py3-pyflakes \
64-
go \
6564
nodejs \
6665
npm \
6766
yarn \

‎flavors/dotnet/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ RUN apk add --update --no-cache \
7777
zlib-dev \
7878
openjdk11 \
7979
py3-pyflakes \
80-
go \
8180
nodejs \
8281
npm \
8382
yarn \

‎flavors/java/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ RUN apk add --update --no-cache \
6161
openssh \
6262
openjdk11 \
6363
py3-pyflakes \
64-
go \
6564
nodejs \
6665
npm \
6766
yarn \

‎flavors/javascript/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ RUN apk add --update --no-cache \
6060
openssh \
6161
openjdk11 \
6262
py3-pyflakes \
63-
go \
6463
nodejs \
6564
npm \
6665
yarn \

‎linters/action_actionlint/Dockerfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# syntax=docker/dockerfile:1
12
###########################################
23
###########################################
34
## Dockerfile to run MegaLinter ##
@@ -10,6 +11,9 @@
1011
## @generated by .automation/build.py using descriptor files, please do not update manually ##
1112
#############################################################################################
1213
#FROM__START
14+
FROM rhysd/actionlint:latest as actionlint
15+
# shellcheck is a dependency for actionlint and the FROM command may be safely repeated in a Dockerfile
16+
FROM koalaman/shellcheck:stable as shellcheck
1317

1418
#FROM__END
1519

@@ -47,7 +51,7 @@ RUN apk add --update --no-cache \
4751
make \
4852
musl-dev \
4953
openssh \
50-
go \
54+
py3-pyflakes \
5155
&& git config --global core.autocrlf true
5256
#APK__END
5357

@@ -115,6 +119,9 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
115119
#############################################################################################
116120

117121
#COPY__START
122+
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
123+
# shellcheck is a dependency for actionlint
124+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
118125

119126
#COPY__END
120127

@@ -123,8 +130,10 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
123130
#############################################################################################
124131
#OTHER__START
125132
# actionlint installation
126-
ENV GO111MODULE=on
127-
RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --cache
133+
# Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
134+
# shellcheck is a dependency for actionlint
135+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
136+
128137

129138
#OTHER__END
130139

‎linters/arm_arm_ttk/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# syntax=docker/dockerfile:1
12
###########################################
23
###########################################
34
## Dockerfile to run MegaLinter ##

‎linters/bash_exec/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# syntax=docker/dockerfile:1
12
###########################################
23
###########################################
34
## Dockerfile to run MegaLinter ##

‎linters/bash_shfmt/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# syntax=docker/dockerfile:1
12
###########################################
23
###########################################
34
## Dockerfile to run MegaLinter ##
@@ -114,15 +115,15 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
114115
#############################################################################################
115116

116117
#COPY__START
117-
COPY --from=shfmt /bin/shfmt /usr/bin/
118+
COPY --link --from=shfmt /bin/shfmt /usr/bin/
118119
#COPY__END
119120

120121
#############################################################################################
121122
## @generated by .automation/build.py using descriptor files, please do not update manually ##
122123
#############################################################################################
123124
#OTHER__START
124125
# shfmt installation
125-
# Managed with COPY --from=shfmt /bin/shfmt /usr/bin/
126+
# Managed with COPY --link --from=shfmt /bin/shfmt /usr/bin/
126127

127128
#OTHER__END
128129

0 commit comments

Comments
 (0)