Tweaked the python run commands

Author: waterfoul

.automation/build.py

@@ -641,11 +641,12 @@ def build_dockerfile(
             pip_linter_env = data["env"]
             pipenv_download_list += pip_linter_packages
             pipenv_install_command += (
-                f'RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \\\n   mkdir -p "/venvs/{pip_linter}" '
-                + f'&& cd "/venvs/{pip_linter}" '
-                + "&& python3 -m crossenv /usr/local/bin/target-python3 . "
-                + "&& source bin/activate "
-                + f"&& PYTHONDONTWRITEBYTECODE=1 {pip_linter_env} pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip "
+                'RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \\\n'
+                f'   mkdir -p "/venvs/{pip_linter}" \\\n'
+                + f' && cd "/venvs/{pip_linter}" \\\n'
+                + " && python3 -m crossenv /usr/local/bin/target-python3 . \\\n"
+                + " && source bin/activate \\\n"
+                + f" && PYTHONDONTWRITEBYTECODE=1 {pip_linter_env} pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip "
                 + (" ".join(pip_linter_packages))
                 + "\\n"
             )

Dockerfile

@@ -327,47 +327,131 @@ RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
 
 #PIPVENV__START
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/ansible-lint" && cd "/venvs/ansible-lint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip ansible-lint
+   mkdir -p "/venvs/ansible-lint" \
+ && cd "/venvs/ansible-lint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip ansible-lint
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/cpplint" && cd "/venvs/cpplint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip cpplint
+   mkdir -p "/venvs/cpplint" \
+ && cd "/venvs/cpplint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip cpplint
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/cfn-lint" && cd "/venvs/cfn-lint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip cfn-lint
+   mkdir -p "/venvs/cfn-lint" \
+ && cd "/venvs/cfn-lint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip cfn-lint
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/djlint" && cd "/venvs/djlint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip djlint
+   mkdir -p "/venvs/djlint" \
+ && cd "/venvs/djlint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip djlint
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/pylint" && cd "/venvs/pylint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip pylint typing-extensions
+   mkdir -p "/venvs/pylint" \
+ && cd "/venvs/pylint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip pylint typing-extensions
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/black" && cd "/venvs/black" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip black
+   mkdir -p "/venvs/black" \
+ && cd "/venvs/black" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip black
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/flake8" && cd "/venvs/flake8" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip flake8
+   mkdir -p "/venvs/flake8" \
+ && cd "/venvs/flake8" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip flake8
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/isort" && cd "/venvs/isort" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip isort black
+   mkdir -p "/venvs/isort" \
+ && cd "/venvs/isort" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip isort black
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/bandit" && cd "/venvs/bandit" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip bandit bandit_sarif_formatter bandit[toml]
+   mkdir -p "/venvs/bandit" \
+ && cd "/venvs/bandit" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip bandit bandit_sarif_formatter bandit[toml]
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/mypy" && cd "/venvs/mypy" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip mypy
+   mkdir -p "/venvs/mypy" \
+ && cd "/venvs/mypy" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip mypy
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/pyright" && cd "/venvs/pyright" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip pyright
+   mkdir -p "/venvs/pyright" \
+ && cd "/venvs/pyright" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip pyright
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/checkov" && cd "/venvs/checkov" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip packaging checkov
+   mkdir -p "/venvs/checkov" \
+ && cd "/venvs/checkov" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip packaging checkov
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/semgrep" && cd "/venvs/semgrep" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip semgrep
+   mkdir -p "/venvs/semgrep" \
+ && cd "/venvs/semgrep" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip semgrep
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/rst-lint" && cd "/venvs/rst-lint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip restructuredtext_lint
+   mkdir -p "/venvs/rst-lint" \
+ && cd "/venvs/rst-lint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip restructuredtext_lint
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/rstcheck" && cd "/venvs/rstcheck" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip rstcheck
+   mkdir -p "/venvs/rstcheck" \
+ && cd "/venvs/rstcheck" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip rstcheck
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/rstfmt" && cd "/venvs/rstfmt" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip rstfmt
+   mkdir -p "/venvs/rstfmt" \
+ && cd "/venvs/rstfmt" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip rstfmt
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/snakemake" && cd "/venvs/snakemake" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip snakemake
+   mkdir -p "/venvs/snakemake" \
+ && cd "/venvs/snakemake" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip snakemake
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/snakefmt" && cd "/venvs/snakefmt" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip snakefmt
+   mkdir -p "/venvs/snakefmt" \
+ && cd "/venvs/snakefmt" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip snakefmt
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/proselint" && cd "/venvs/proselint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip proselint
+   mkdir -p "/venvs/proselint" \
+ && cd "/venvs/proselint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip proselint
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/sqlfluff" && cd "/venvs/sqlfluff" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip sqlfluff
+   mkdir -p "/venvs/sqlfluff" \
+ && cd "/venvs/sqlfluff" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip sqlfluff
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/yamllint" && cd "/venvs/yamllint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip yamllint
+   mkdir -p "/venvs/yamllint" \
+ && cd "/venvs/yamllint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip yamllint
 
 #PIPVENV__END
 

flavors/ci_light/Dockerfile

@@ -157,7 +157,11 @@ RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
 
 #PIPVENV__START
 RUN --mount=type=cache,id=pip,sharing=shared,target=/var/cache/pip,uid=0 \
-   mkdir -p "/venvs/yamllint" && cd "/venvs/yamllint" && python3 -m crossenv /usr/local/bin/target-python3 . && source bin/activate && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip yamllint
+   mkdir -p "/venvs/yamllint" \
+ && cd "/venvs/yamllint" \
+ && python3 -m crossenv /usr/local/bin/target-python3 . \
+ && source bin/activate \
+ && PYTHONDONTWRITEBYTECODE=1  pip3 --disable-pip-version-check install --find-links=/download --cache-dir=/var/cache/pip yamllint
 
 #PIPVENV__END