From ff58f1f9f1886c148ef1bb52ac4b831b6fa5a6d0 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 21 Oct 2024 23:25:52 +0200 Subject: [PATCH] make ^C work on these runs this looks bigger than it needs to because the simple fix (add -t to docker run) breaks CI runs --- scripts/build-targets/Dockerfile.armel | 6 +++++- scripts/build-targets/run | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/build-targets/Dockerfile.armel b/scripts/build-targets/Dockerfile.armel index 29329ddd..e735447b 100644 --- a/scripts/build-targets/Dockerfile.armel +++ b/scripts/build-targets/Dockerfile.armel @@ -9,6 +9,10 @@ RUN apt-get -yy install \ pkg-config \ libssl-dev \ python3-pip \ - xxd + xxd \ + tini RUN pip install --break-system-packages meson RUN git config --global --add safe.directory '*' # this makes meson's vcs_tag() work +ENV PYTHONUNBUFFERED=1 +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/bin/sh"] diff --git a/scripts/build-targets/run b/scripts/build-targets/run index 9d755aae..2cb6920b 100755 --- a/scripts/build-targets/run +++ b/scripts/build-targets/run @@ -1,4 +1,4 @@ #!/bin/sh TARGET=$1 shift -docker run -v $(pwd):$(pwd) -w $(pwd) --rm voorkant-builder:$TARGET "$@" +docker run -i -v $(pwd):$(pwd) -w $(pwd) --rm voorkant-builder:$TARGET "$@"