lint: Flatten lint image entry points

This commit is contained in:
MarcoFalke 2026-01-28 11:12:40 +01:00
parent 1111fff91c
commit faba426b3b
No known key found for this signature in database
5 changed files with 8 additions and 23 deletions

View File

@ -73,6 +73,7 @@ def main():
*get_worktree_mounts(repo_root),
*([] if is_ci else ["-it"]),
container,
"./ci/lint/06_script.sh",
*sys.argv[1:],
]
)

View File

@ -8,6 +8,7 @@ export LC_ALL=C
set -o errexit -o pipefail -o xtrace
export DEBIAN_FRONTEND=noninteractive
export CI_RETRY_EXE="/ci_retry"
pushd "/"

View File

@ -8,6 +8,12 @@ export LC_ALL=C
set -o errexit -o pipefail -o xtrace
# Fixes permission issues when there is a container UID/GID mismatch with the owner
# of the mounted bitcoin src dir.
git config --global --add safe.directory /bitcoin
export PATH="/python_build/bin:${PATH}"
if [ -n "${LINT_CI_IS_PR}" ]; then
export COMMIT_RANGE="HEAD~..HEAD"
if [ "$(git rev-list -1 HEAD)" != "$(git rev-list -1 --merges HEAD)" ]; then

View File

@ -1,15 +0,0 @@
#!/usr/bin/env bash
#
# Copyright (c) The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit/.
export LC_ALL=C
# Fixes permission issues when there is a container UID/GID mismatch with the owner
# of the mounted bitcoin src dir.
git config --global --add safe.directory /bitcoin
export PATH="/python_build/bin:${PATH}"
./ci/lint/06_script.sh "$@"

View File

@ -6,19 +6,11 @@
FROM mirror.gcr.io/ubuntu:24.04
ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C.UTF-8
COPY ./ci/retry/retry /ci_retry
COPY ./.python-version /.python-version
COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh
COPY ./ci/lint/01_install.sh /install.sh
RUN /install.sh && \
echo 'alias lint="./ci/lint/06_script.sh"' >> ~/.bashrc && \
chmod 755 /entrypoint.sh && \
rm -rf /var/lib/apt/lists/*
WORKDIR /bitcoin
ENTRYPOINT ["/entrypoint.sh"]