Skip to content

Commit

Permalink
Adding force overwrite back in
Browse files Browse the repository at this point in the history
  • Loading branch information
@waterfoul
waterfoul committed Apr 12, 2023
1 parent 5972e1a commit de7bd9f
Show file tree
Hide file tree
Showing 130 changed files with 163 additions and 163 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -573,7 +573,7 @@ esac \
esac \
&& wget --tries=5 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
&& wget --tries=5 -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
&& apk add --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
&& apk add --force-overwrite --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
&& wget --tries=5 https://storage.googleapis.com/dart-archive/channels/stable/release/${DART_VERSION}/sdk/dartsdk-linux-${DART_ARCH}-release.zip -O - -q | unzip -q - \
&& chmod +x dart-sdk/bin/dart* \
&& mv dart-sdk/bin/* /usr/bin/ && mv dart-sdk/lib/* /usr/lib/ && mv dart-sdk/include/* /usr/include/ \
Expand Down
6 changes: 3 additions & 3 deletions flavors/ci_light/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -177,7 +177,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/cupcake/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -262,7 +262,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/documentation/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -209,7 +209,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/dotnet/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -227,7 +227,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/go/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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -217,7 +217,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/java/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -210,7 +210,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/javascript/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -207,7 +207,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -221,7 +221,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/python/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -229,7 +229,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/ruby/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -207,7 +207,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/rust/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -207,7 +207,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/salesforce/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -207,7 +207,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/security/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -193,7 +193,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/swift/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -209,7 +209,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
6 changes: 3 additions & 3 deletions flavors/terraform/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,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 install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
&& cargo install 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 Expand Up @@ -219,7 +219,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
# Ignore npm package issues
yarn config set ignore-engines true || true

COPY --link --from=python-venv /venv /venv
COPY --link --from=python-venv /venvs /venvs

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
Loading

0 comments on commit de7bd9f

Please sign in to comment.