From 1b4623baeb27155f0b753a9b47b6edc3b63114c9 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Wed, 2 Mar 2022 18:17:01 +0000 Subject: [PATCH 1/2] Add support for Python debugging in GDB Switching from 3.6-stretch to 3.6.14-stretch. They are exactly the same image, but the latter is semantically better since the GDB Python script is for that patch version. --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 559b29c..276f7f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /tcp_closer/src/build RUN cmake .. RUN make package -FROM python:3.6-stretch +FROM python:3.6.14-stretch RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ build-essential \ libxml2-dev libxslt-dev zlib1g-dev libssl-dev libsqlite3-dev \ @@ -19,6 +19,10 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ build-essential autoconf automake libzmq3-dev libmnl0 make \ && rm -rf /var/lib/apt/lists/* +# GDB support for Python commands (e.g. py-bt) +RUN mkdir -p /usr/share/gdb/auto-load/usr/local/bin/ && \ + curl -L https://github.com/python/cpython/raw/v3.6.14/Tools/gdb/libpython.py -o /usr/share/gdb/auto-load/usr/local/bin/python3.6-gdb.py + # Install tcp-closer COPY --from=builder /tcp_closer/src/build/tcp-closer-0.1.1-Linux.deb /tcp-closer.deb RUN dpkg -i /tcp-closer.deb From 7bd66389eeee6d8972200d68bf788e3fb7cf7329 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Wed, 2 Mar 2022 18:19:30 +0000 Subject: [PATCH 2/2] Force uploader.py to unbuffered output to fix Docker logs timestamps --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 44f60b2..334fb5b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -87,7 +87,7 @@ case "$1" in rmdir "$STAGING_WARCS_DIR" ;; "uploader") - python ./uploader/uploader.py "$SHARED_WARCS_DIR/upload-queue/" + python -u ./uploader/uploader.py "$SHARED_WARCS_DIR/upload-queue/" ;; "analyzer") export UPDATES_CHANNEL=updates