Skip to content

Commit

Permalink
Ran the build after cherry pick
Browse files Browse the repository at this point in the history
  • Loading branch information
@waterfoul
waterfoul committed May 15, 2023
1 parent 695aefa commit 010cb24
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u

RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
. /cargo/.cargo/env \
&& 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")
&& 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")

FROM scratch AS cargo
COPY --link --from=cargo-build /tmp/bin/* /bin/
RUN ["/bin/shellcheck-sarif", "--help"]
RUN ["/bin/sarif-fmt", "--help"]
RUN ["/bin/shellcheck-sarif", "--help"]

#FROM__END

Expand Down
4 changes: 2 additions & 2 deletions flavors/cupcake/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u

RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
. /cargo/.cargo/env \
&& 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")
&& 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")

FROM scratch AS cargo
COPY --link --from=cargo-build /tmp/bin/* /bin/
RUN ["/bin/shellcheck-sarif", "--help"]
RUN ["/bin/sarif-fmt", "--help"]
RUN ["/bin/shellcheck-sarif", "--help"]

#FROM__END

Expand Down
4 changes: 2 additions & 2 deletions flavors/rust/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u

RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
. /cargo/.cargo/env \
&& 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")
&& 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")

FROM scratch AS cargo
COPY --link --from=cargo-build /tmp/bin/* /bin/
RUN ["/bin/shellcheck-sarif", "--help"]
RUN ["/bin/sarif-fmt", "--help"]
RUN ["/bin/shellcheck-sarif", "--help"]

#FROM__END

Expand Down

0 comments on commit 010cb24

Please sign in to comment.