Skip to content

Commit 533180a

Browse files
committed
Fix env
1 parent 12b8fc8 commit 533180a

File tree

39 files changed

+45
-45
lines changed

39 files changed

+45
-45
lines changed

.automation/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ def build_dockerfile(
650650
+ (" ".join(pip_linter_packages))
651651
+ "\\n"
652652
)
653-
pipenv_path_command += f":/venvs/{pip_linter}/bin"
653+
pipenv_path_command += f":/venvs/{pip_linter}/cross/bin"
654654
pipenv_download_command += (
655655
'&& pip download --cache-dir=/var/cache/pip --dest "/download" \\\n '
656656
+ (" \\\n ".join(pipenv_download_list))

Dockerfile

Lines changed: 3 additions & 3 deletions
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 sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
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")
8686

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

9292
#FROM__END
9393

@@ -582,7 +582,7 @@ COPY --link --from=python-venv /venvs /venvs
582582
#PIP__END
583583

584584
#PIPVENV_PATH__START
585-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/cpplint/bin:/venvs/cfn-lint/bin:/venvs/djlint/bin:/venvs/pylint/bin:/venvs/black/bin:/venvs/flake8/bin:/venvs/isort/bin:/venvs/bandit/bin:/venvs/mypy/bin:/venvs/pyright/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/rst-lint/bin:/venvs/rstcheck/bin:/venvs/rstfmt/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
585+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/cpplint/cross/bin:/venvs/cfn-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/pylint/cross/bin:/venvs/black/cross/bin:/venvs/flake8/cross/bin:/venvs/isort/cross/bin:/venvs/bandit/cross/bin:/venvs/mypy/cross/bin:/venvs/pyright/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/rst-lint/cross/bin:/venvs/rstcheck/cross/bin:/venvs/rstfmt/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
586586
#PIPVENV_PATH__END
587587

588588
# Add node packages to path #

flavors/ci_light/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ COPY --link --from=python-venv /venvs /venvs
243243
#PIP__END
244244

245245
#PIPVENV_PATH__START
246-
ENV PATH="${PATH}":/venvs/yamllint/bin
246+
ENV PATH="${PATH}":/venvs/yamllint/cross/bin
247247
#PIPVENV_PATH__END
248248

249249
# Add node packages to path #

flavors/cupcake/Dockerfile

Lines changed: 3 additions & 3 deletions
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 sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
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")
8181

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

8787
#FROM__END
8888

@@ -509,7 +509,7 @@ COPY --link --from=python-venv /venvs /venvs
509509
#PIP__END
510510

511511
#PIPVENV_PATH__START
512-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/cpplint/bin:/venvs/cfn-lint/bin:/venvs/djlint/bin:/venvs/pylint/bin:/venvs/black/bin:/venvs/flake8/bin:/venvs/isort/bin:/venvs/mypy/bin:/venvs/pyright/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/rst-lint/bin:/venvs/rstcheck/bin:/venvs/rstfmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
512+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/cpplint/cross/bin:/venvs/cfn-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/pylint/cross/bin:/venvs/black/cross/bin:/venvs/flake8/cross/bin:/venvs/isort/cross/bin:/venvs/mypy/cross/bin:/venvs/pyright/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/rst-lint/cross/bin:/venvs/rstcheck/cross/bin:/venvs/rstfmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
513513
#PIPVENV_PATH__END
514514

515515
# Add node packages to path #

flavors/documentation/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ COPY --link --from=python-venv /venvs /venvs
346346
#PIP__END
347347

348348
#PIPVENV_PATH__START
349-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/djlint/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
349+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
350350
#PIPVENV_PATH__END
351351

352352
# Add node packages to path #

flavors/dotnet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ COPY --link --from=python-venv /venvs /venvs
372372
#PIP__END
373373

374374
#PIPVENV_PATH__START
375-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/cpplint/bin:/venvs/djlint/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
375+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/cpplint/cross/bin:/venvs/djlint/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
376376
#PIPVENV_PATH__END
377377

378378
# Add node packages to path #

flavors/go/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ COPY --link --from=python-venv /venvs /venvs
354354
#PIP__END
355355

356356
#PIPVENV_PATH__START
357-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/djlint/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
357+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
358358
#PIPVENV_PATH__END
359359

360360
# Add node packages to path #

flavors/java/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ COPY --link --from=python-venv /venvs /venvs
346346
#PIP__END
347347

348348
#PIPVENV_PATH__START
349-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/djlint/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
349+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
350350
#PIPVENV_PATH__END
351351

352352
# Add node packages to path #

flavors/javascript/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ COPY --link --from=python-venv /venvs /venvs
365365
#PIP__END
366366

367367
#PIPVENV_PATH__START
368-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/djlint/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
368+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
369369
#PIPVENV_PATH__END
370370

371371
# Add node packages to path #

flavors/php/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ COPY --link --from=python-venv /venvs /venvs
358358
#PIP__END
359359

360360
#PIPVENV_PATH__START
361-
ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/djlint/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
361+
ENV PATH="${PATH}":/venvs/ansible-lint/cross/bin:/venvs/djlint/cross/bin:/venvs/checkov/cross/bin:/venvs/semgrep/cross/bin:/venvs/snakemake/cross/bin:/venvs/snakefmt/cross/bin:/venvs/proselint/cross/bin:/venvs/sqlfluff/cross/bin:/venvs/yamllint/cross/bin
362362
#PIPVENV_PATH__END
363363

364364
# Add node packages to path #

0 commit comments

Comments
 (0)