Skip to content

Commit 5acf8ac

Browse files
waterfoulwaterfoul
committed
Adding force overwrite back in
1 parent 4cf228f commit 5acf8ac

File tree

130 files changed

+161
-160
lines changed

Some content is hidden

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

130 files changed

+161
-160
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
6666

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

7171
FROM scratch AS cargo
7272
COPY --link --from=cargo-build /tmp/bin/* /bin/
73-
RUN ["/bin/shellcheck-sarif", "--help"]
7473
RUN ["/bin/sarif-fmt", "--help"]
74+
RUN ["/bin/shellcheck-sarif", "--help"]
7575

7676
#FROM__END
7777

@@ -516,7 +516,7 @@ esac \
516516
esac \
517517
&& wget --tries=5 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
518518
&& wget --tries=5 -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
519-
&& apk add --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
519+
&& apk add --force-overwrite --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
520520
&& 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 - \
521521
&& chmod +x dart-sdk/bin/dart* \
522522
&& mv dart-sdk/bin/* /usr/bin/ && mv dart-sdk/lib/* /usr/lib/ && mv dart-sdk/include/* /usr/include/ \

‎flavors/ci_light/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ 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

@@ -177,7 +177,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
177177
# Ignore npm package issues
178178
yarn config set ignore-engines true || true
179179

180-
COPY --link --from=python-venv /venv /venv
180+
COPY --link --from=python-venv /venvs /venvs
181181

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

‎flavors/cupcake/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
193193
# Ignore npm package issues
194194
yarn config set ignore-engines true || true
195195

196+
COPY --link --from=python-venv /venv /venv
196197
#############################################################################################
197198
## @generated by .automation/build.py using descriptor files, please do not update manually ##
198199
#############################################################################################

‎flavors/documentation/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ 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

@@ -209,7 +209,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
209209
# Ignore npm package issues
210210
yarn config set ignore-engines true || true
211211

212-
COPY --link --from=python-venv /venv /venv
212+
COPY --link --from=python-venv /venvs /venvs
213213

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

‎flavors/dotnet/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ 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

@@ -227,7 +227,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
227227
# Ignore npm package issues
228228
yarn config set ignore-engines true || true
229229

230-
COPY --link --from=python-venv /venv /venv
230+
COPY --link --from=python-venv /venvs /venvs
231231

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

‎flavors/go/Dockerfile‎

Lines changed: 3 additions & 3 deletions
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 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

@@ -217,7 +217,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
217217
# Ignore npm package issues
218218
yarn config set ignore-engines true || true
219219

220-
COPY --link --from=python-venv /venv /venv
220+
COPY --link --from=python-venv /venvs /venvs
221221

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

‎flavors/java/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ 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

@@ -210,7 +210,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
210210
# Ignore npm package issues
211211
yarn config set ignore-engines true || true
212212

213-
COPY --link --from=python-venv /venv /venv
213+
COPY --link --from=python-venv /venvs /venvs
214214

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

‎flavors/javascript/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
4949

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

5454
FROM scratch AS cargo
5555
COPY --link --from=cargo-build /tmp/bin/* /bin/
56-
RUN ["/bin/shellcheck-sarif", "--help"]
5756
RUN ["/bin/sarif-fmt", "--help"]
57+
RUN ["/bin/shellcheck-sarif", "--help"]
5858

5959
#FROM__END
6060

@@ -207,7 +207,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
207207
# Ignore npm package issues
208208
yarn config set ignore-engines true || true
209209

210-
COPY --link --from=python-venv /venv /venv
210+
COPY --link --from=python-venv /venvs /venvs
211211

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

‎flavors/php/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ 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

@@ -221,7 +221,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
221221
# Ignore npm package issues
222222
yarn config set ignore-engines true || true
223223

224-
COPY --link --from=python-venv /venv /venv
224+
COPY --link --from=python-venv /venvs /venvs
225225

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

‎flavors/python/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ 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

@@ -229,7 +229,7 @@ RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin || true && \
229229
# Ignore npm package issues
230230
yarn config set ignore-engines true || true
231231

232-
COPY --link --from=python-venv /venv /venv
232+
COPY --link --from=python-venv /venvs /venvs
233233

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

0 commit comments

Comments
 (0)