Skip to content

Commit 71bc510

Browse files
waterfoulwaterfoul
committed
Temporary changes to cross compile the venvs
1 parent 454daa3 commit 71bc510

File tree

128 files changed

+2133
-1365
lines changed

Some content is hidden

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

128 files changed

+2133
-1365
lines changed

‎flavors/ci_light/Dockerfile‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,33 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
4343

4444
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
4545
. /cargo/.cargo/env \
46-
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
46+
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
4747

4848
FROM scratch AS cargo
4949
COPY --link --from=cargo-build /tmp/bin/* /bin/
50-
RUN ["/bin/shellcheck-sarif", "--help"]
5150
RUN ["/bin/sarif-fmt", "--help"]
51+
RUN ["/bin/shellcheck-sarif", "--help"]
5252

5353
#FROM__END
5454

55+
FROM scratch AS copy-collector
56+
57+
##############################
58+
# COPY instructions #
59+
#############################################################################################
60+
## @generated by .automation/build.py using descriptor files, please do not update manually ##
61+
#############################################################################################
62+
63+
#COPY__START
64+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
65+
COPY --link --from=shfmt /bin/shfmt /usr/bin/
66+
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
67+
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
68+
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
69+
COPY --link --from=cargo /bin/* /usr/bin/
70+
#COPY__END
71+
72+
5573
##################
5674
# Get base image #
5775
##################
@@ -205,20 +223,8 @@ RUN echo 'gem: --no-document' >> ~/.gemrc && \
205223

206224
#CARGO__END
207225

208-
##############################
209-
# COPY instructions #
210-
#############################################################################################
211-
## @generated by .automation/build.py using descriptor files, please do not update manually ##
212-
#############################################################################################
213-
214-
#COPY__START
215-
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
216-
COPY --link --from=shfmt /bin/shfmt /usr/bin/
217-
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
218-
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
219-
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
220-
COPY --from=cargo /bin/* /usr/bin/
221-
#COPY__END
226+
# Don't add link to this one otherwise it doesn't merge correctly
227+
COPY --from=copy-collector / /
222228

223229
#############################################################################################
224230
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/cupcake/Dockerfile‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,47 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
6262

6363
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
6464
. /cargo/.cargo/env \
65-
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
65+
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
6666

6767
FROM scratch AS cargo
6868
COPY --link --from=cargo-build /tmp/bin/* /bin/
69-
RUN ["/bin/shellcheck-sarif", "--help"]
7069
RUN ["/bin/sarif-fmt", "--help"]
70+
RUN ["/bin/shellcheck-sarif", "--help"]
7171

7272
#FROM__END
7373

74+
FROM scratch AS copy-collector
75+
76+
##############################
77+
# COPY instructions #
78+
#############################################################################################
79+
## @generated by .automation/build.py using descriptor files, please do not update manually ##
80+
#############################################################################################
81+
82+
#COPY__START
83+
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
84+
# shellcheck is a dependency for actionlint
85+
86+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
87+
# Next COPY line commented because already managed by another linter
88+
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
89+
COPY --link --from=shfmt /bin/shfmt /usr/bin/
90+
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
91+
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
92+
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
93+
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
94+
COPY --link --from=phpstan /composer/vendor/phpstan/phpstan/phpstan.phar /usr/bin/phpstan
95+
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
96+
COPY --link --from=tflint /usr/local/bin/tflint /usr/bin/
97+
COPY --link --from=terrascan /go/bin/terrascan /usr/bin/
98+
COPY --link --from=terragrunt /usr/local/bin/terragrunt /usr/bin/
99+
COPY --link --from=terragrunt /bin/terraform /usr/bin/
100+
COPY --link --from=kics /app/bin/kics /usr/bin/
101+
COPY --from=kics /app/bin/assets /opt/kics/assets/
102+
COPY --link --from=cargo /bin/* /usr/bin/
103+
#COPY__END
104+
105+
74106
##################
75107
# Get base image #
76108
##################
@@ -303,34 +335,8 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-too
303335
ENV PATH="/root/.cargo/bin:${PATH}"
304336
#CARGO__END
305337

306-
##############################
307-
# COPY instructions #
308-
#############################################################################################
309-
## @generated by .automation/build.py using descriptor files, please do not update manually ##
310-
#############################################################################################
311-
312-
#COPY__START
313-
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
314-
# shellcheck is a dependency for actionlint
315-
316-
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
317-
# Next COPY line commented because already managed by another linter
318-
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
319-
COPY --link --from=shfmt /bin/shfmt /usr/bin/
320-
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
321-
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
322-
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
323-
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
324-
COPY --link --from=phpstan /composer/vendor/phpstan/phpstan/phpstan.phar /usr/bin/phpstan
325-
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
326-
COPY --link --from=tflint /usr/local/bin/tflint /usr/bin/
327-
COPY --link --from=terrascan /go/bin/terrascan /usr/bin/
328-
COPY --link --from=terragrunt /usr/local/bin/terragrunt /usr/bin/
329-
COPY --link --from=terragrunt /bin/terraform /usr/bin/
330-
COPY --link --from=kics /app/bin/kics /usr/bin/
331-
COPY --from=kics /app/bin/assets /opt/kics/assets/
332-
COPY --from=cargo /bin/* /usr/bin/
333-
#COPY__END
338+
# Don't add link to this one otherwise it doesn't merge correctly
339+
COPY --from=copy-collector / /
334340

335341
#############################################################################################
336342
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/documentation/Dockerfile‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,40 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
5050

5151
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
5252
. /cargo/.cargo/env \
53-
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
53+
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
5454

5555
FROM scratch AS cargo
5656
COPY --link --from=cargo-build /tmp/bin/* /bin/
57-
RUN ["/bin/shellcheck-sarif", "--help"]
5857
RUN ["/bin/sarif-fmt", "--help"]
58+
RUN ["/bin/shellcheck-sarif", "--help"]
5959

6060
#FROM__END
6161

62+
FROM scratch AS copy-collector
63+
64+
##############################
65+
# COPY instructions #
66+
#############################################################################################
67+
## @generated by .automation/build.py using descriptor files, please do not update manually ##
68+
#############################################################################################
69+
70+
#COPY__START
71+
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
72+
# shellcheck is a dependency for actionlint
73+
74+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
75+
# Next COPY line commented because already managed by another linter
76+
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
77+
COPY --link --from=shfmt /bin/shfmt /usr/bin/
78+
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
79+
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
80+
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
81+
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
82+
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
83+
COPY --link --from=cargo /bin/* /usr/bin/
84+
#COPY__END
85+
86+
6287
##################
6388
# Get base image #
6489
##################
@@ -237,27 +262,8 @@ RUN echo 'gem: --no-document' >> ~/.gemrc && \
237262

238263
#CARGO__END
239264

240-
##############################
241-
# COPY instructions #
242-
#############################################################################################
243-
## @generated by .automation/build.py using descriptor files, please do not update manually ##
244-
#############################################################################################
245-
246-
#COPY__START
247-
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
248-
# shellcheck is a dependency for actionlint
249-
250-
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
251-
# Next COPY line commented because already managed by another linter
252-
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
253-
COPY --link --from=shfmt /bin/shfmt /usr/bin/
254-
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
255-
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
256-
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
257-
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
258-
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
259-
COPY --from=cargo /bin/* /usr/bin/
260-
#COPY__END
265+
# Don't add link to this one otherwise it doesn't merge correctly
266+
COPY --from=copy-collector / /
261267

262268
#############################################################################################
263269
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/dotnet/Dockerfile‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,40 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
5050

5151
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
5252
. /cargo/.cargo/env \
53-
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
53+
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
5454

5555
FROM scratch AS cargo
5656
COPY --link --from=cargo-build /tmp/bin/* /bin/
57-
RUN ["/bin/shellcheck-sarif", "--help"]
5857
RUN ["/bin/sarif-fmt", "--help"]
58+
RUN ["/bin/shellcheck-sarif", "--help"]
5959

6060
#FROM__END
6161

62+
FROM scratch AS copy-collector
63+
64+
##############################
65+
# COPY instructions #
66+
#############################################################################################
67+
## @generated by .automation/build.py using descriptor files, please do not update manually ##
68+
#############################################################################################
69+
70+
#COPY__START
71+
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
72+
# shellcheck is a dependency for actionlint
73+
74+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
75+
# Next COPY line commented because already managed by another linter
76+
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
77+
COPY --link --from=shfmt /bin/shfmt /usr/bin/
78+
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
79+
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
80+
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
81+
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
82+
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
83+
COPY --link --from=cargo /bin/* /usr/bin/
84+
#COPY__END
85+
86+
6287
##################
6388
# Get base image #
6489
##################
@@ -257,27 +282,8 @@ RUN echo 'gem: --no-document' >> ~/.gemrc && \
257282

258283
#CARGO__END
259284

260-
##############################
261-
# COPY instructions #
262-
#############################################################################################
263-
## @generated by .automation/build.py using descriptor files, please do not update manually ##
264-
#############################################################################################
265-
266-
#COPY__START
267-
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
268-
# shellcheck is a dependency for actionlint
269-
270-
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
271-
# Next COPY line commented because already managed by another linter
272-
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
273-
COPY --link --from=shfmt /bin/shfmt /usr/bin/
274-
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
275-
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
276-
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
277-
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
278-
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
279-
COPY --from=cargo /bin/* /usr/bin/
280-
#COPY__END
285+
# Don't add link to this one otherwise it doesn't merge correctly
286+
COPY --from=copy-collector / /
281287

282288
#############################################################################################
283289
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/go/Dockerfile‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,41 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
5656

5757
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
5858
. /cargo/.cargo/env \
59-
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
59+
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
6060

6161
FROM scratch AS cargo
6262
COPY --link --from=cargo-build /tmp/bin/* /bin/
63-
RUN ["/bin/shellcheck-sarif", "--help"]
6463
RUN ["/bin/sarif-fmt", "--help"]
64+
RUN ["/bin/shellcheck-sarif", "--help"]
6565

6666
#FROM__END
6767

68+
FROM scratch AS copy-collector
69+
70+
##############################
71+
# COPY instructions #
72+
#############################################################################################
73+
## @generated by .automation/build.py using descriptor files, please do not update manually ##
74+
#############################################################################################
75+
76+
#COPY__START
77+
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
78+
# shellcheck is a dependency for actionlint
79+
80+
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
81+
# Next COPY line commented because already managed by another linter
82+
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
83+
COPY --link --from=shfmt /bin/shfmt /usr/bin/
84+
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
85+
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
86+
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
87+
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
88+
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
89+
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
90+
COPY --link --from=cargo /bin/* /usr/bin/
91+
#COPY__END
92+
93+
6894
##################
6995
# Get base image #
7096
##################
@@ -244,28 +270,8 @@ RUN echo 'gem: --no-document' >> ~/.gemrc && \
244270

245271
#CARGO__END
246272

247-
##############################
248-
# COPY instructions #
249-
#############################################################################################
250-
## @generated by .automation/build.py using descriptor files, please do not update manually ##
251-
#############################################################################################
252-
253-
#COPY__START
254-
COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint
255-
# shellcheck is a dependency for actionlint
256-
257-
COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
258-
# Next COPY line commented because already managed by another linter
259-
# COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
260-
COPY --link --from=shfmt /bin/shfmt /usr/bin/
261-
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
262-
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
263-
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
264-
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
265-
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
266-
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
267-
COPY --from=cargo /bin/* /usr/bin/
268-
#COPY__END
273+
# Don't add link to this one otherwise it doesn't merge correctly
274+
COPY --from=copy-collector / /
269275

270276
#############################################################################################
271277
## @generated by .automation/build.py using descriptor files, please do not update manually ##

0 commit comments

Comments
 (0)