From fadc5232f49ebe0e23599cf76d6aadbd63e575b9 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Wed, 19 Jul 2023 11:12:12 +0200 Subject: doc: Add doc comment to ci/test_imagefile (Similar to the doc comment in ci/lint_imagefile) Also, rename docker-entrypoint.sh to container-entrypoint.sh Also, add copyright header to touched files. --- ci/lint/container-entrypoint.sh | 19 +++++++++++++++++++ ci/lint/docker-entrypoint.sh | 14 -------------- ci/lint_imagefile | 6 +++++- ci/test_imagefile | 6 ++++++ 4 files changed, 30 insertions(+), 15 deletions(-) create mode 100755 ci/lint/container-entrypoint.sh delete mode 100755 ci/lint/docker-entrypoint.sh (limited to 'ci') diff --git a/ci/lint/container-entrypoint.sh b/ci/lint/container-entrypoint.sh new file mode 100755 index 0000000000..e94a75e22c --- /dev/null +++ b/ci/lint/container-entrypoint.sh @@ -0,0 +1,19 @@ +#!/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}" + +if [ -z "$1" ]; then + LOCAL_BRANCH=1 bash -ic "./ci/lint/06_script.sh" +else + exec "$@" +fi diff --git a/ci/lint/docker-entrypoint.sh b/ci/lint/docker-entrypoint.sh deleted file mode 100755 index 63bd2d4298..0000000000 --- a/ci/lint/docker-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -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}" - -if [ -z "$1" ]; then - LOCAL_BRANCH=1 bash -ic "./ci/lint/06_script.sh" -else - exec "$@" -fi diff --git a/ci/lint_imagefile b/ci/lint_imagefile index 20047ea391..4136a9bfde 100644 --- a/ci/lint_imagefile +++ b/ci/lint_imagefile @@ -1,3 +1,7 @@ +# Copyright (c) The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or https://opensource.org/license/mit/. + # See test/lint/README.md for usage. FROM debian:bookworm @@ -6,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV LC_ALL=C.UTF-8 COPY ./.python-version /.python-version -COPY ./ci/lint/docker-entrypoint.sh /entrypoint.sh +COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh COPY ./ci/lint/04_install.sh /install.sh RUN /install.sh && \ diff --git a/ci/test_imagefile b/ci/test_imagefile index 4854708d1a..8dfb5916b1 100644 --- a/ci/test_imagefile +++ b/ci/test_imagefile @@ -1,3 +1,9 @@ +# Copyright (c) The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or https://opensource.org/license/mit/. + +# See ci/README.md for usage. + ARG CI_IMAGE_NAME_TAG FROM ${CI_IMAGE_NAME_TAG} -- cgit v1.2.3