Skip to content

Commit 010cb24

Browse files
committed
Ran the build after cherry pick
1 parent 695aefa commit 010cb24

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
8282

8383
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
8484
. /cargo/.cargo/env \
85-
&& cargo binstall --no-confirm --no-symlinks shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
85+
&& cargo binstall --no-confirm --no-symlinks sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
8686

8787
FROM scratch AS cargo
8888
COPY --link --from=cargo-build /tmp/bin/* /bin/
89-
RUN ["/bin/shellcheck-sarif", "--help"]
9089
RUN ["/bin/sarif-fmt", "--help"]
90+
RUN ["/bin/shellcheck-sarif", "--help"]
9191

9292
#FROM__END
9393

flavors/cupcake/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
7777

7878
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
7979
. /cargo/.cargo/env \
80-
&& cargo binstall --no-confirm --no-symlinks shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
80+
&& cargo binstall --no-confirm --no-symlinks sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
8181

8282
FROM scratch AS cargo
8383
COPY --link --from=cargo-build /tmp/bin/* /bin/
84-
RUN ["/bin/shellcheck-sarif", "--help"]
8584
RUN ["/bin/sarif-fmt", "--help"]
85+
RUN ["/bin/shellcheck-sarif", "--help"]
8686

8787
#FROM__END
8888

flavors/rust/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ 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 binstall --no-confirm --no-symlinks shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
59+
&& cargo binstall --no-confirm --no-symlinks 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

0 commit comments

Comments
 (0)