docker: Add strace for interactive debugging

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 40ed73f7fb99fcba2bd3c7c3d2dad399ceeeba69..4bf89d344610514b2ead538d9a84427cce197b19 100644 (file)
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -17,13 +17,14 @@ RUN apt-get update && apt-get install -y \
        gcc \
        git \
        libtool \
        gcc \
        git \
        libtool \

-       libuv-dev \

        libdevmapper-dev \
        libfdt-dev \
        libdevmapper-dev \
        libfdt-dev \

-       libncurses-dev \

        libgpgme11-dev \
        libgpgme11-dev \

+       libncurses-dev \

        libssl-dev \
        libssl-dev \

+       libuv-dev \

        pkg-config \
        pkg-config \

+       strace \

        && rm -rf /var/lib/apt/lists/*
 
 CMD /bin/bash
        && rm -rf /var/lib/apt/lists/*
 
 CMD /bin/bash

diff --git a/docker/build-pb b/docker/build-pb
index 6ed2af6d88ffb63a2f9bda2bfdb4491716a53446..1d87fb421447ddce0cdb399d81d99afd03a370db 100755 (executable)
--- a/docker/build-pb
+++ b/docker/build-pb
@@ -105,7 +105,7 @@ docker_user_args="-u $(id -u):$(id -g)"
 
 if [[ -n "${interactive}" ]]; then
        cd "${TOP_DIR}"
 
 if [[ -n "${interactive}" ]]; then
        cd "${TOP_DIR}"

-       docker_args="${docker_base_args}"
+       docker_args="${docker_base_args} --privileged"

        run_cmd "docker run -it ${docker_args} ${DOCKER_TAG} /bin/bash"
        exit
 fi
        run_cmd "docker run -it ${docker_args} ${DOCKER_TAG} /bin/bash"
        exit
 fi

diff --git a/docker/builder-include b/docker/builder-include
index d2d94a4d5f3f032c0f8c982b40b26d43f47e8c69..4f42e2c6e7bbc458d701d2c95310631a32ba3c7d 100644 (file)
--- a/docker/builder-include
+++ b/docker/builder-include
@@ -50,7 +50,7 @@ show_tag () {
        echo "${DOCKER_TAG}"
 }
 
        echo "${DOCKER_TAG}"
 }
 

-: ${VERSION:="2"}
+: ${VERSION:="3"}

 : ${ARCH_TAG:="$(arch_tag)"}
 : ${DOCKER_NAME:="pb-builder"}
 : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"}
 : ${ARCH_TAG:="$(arch_tag)"}
 : ${DOCKER_NAME:="pb-builder"}
 : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"}