[v1,1/6] docker: Add strace for interactive debugging

Message ID 9f7d6097fdaaf72b67a27f6c635cac7184c0f007.1533686335.git.geoff@infradead.org
State Accepted
Headers show
Series
  • [v1,1/6] docker: Add strace for interactive debugging
Related show

Commit Message

Geoff Levand Aug. 8, 2018, 12:01 a.m.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 docker/Dockerfile.builder | 5 +++--
 docker/build-pb           | 2 +-
 docker/builder-include    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 40ed73f..4bf89d3 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -17,13 +17,14 @@  RUN apt-get update && apt-get install -y \
 	gcc \
 	git \
 	libtool \
-	libuv-dev \
 	libdevmapper-dev \
 	libfdt-dev \
-	libncurses-dev \
 	libgpgme11-dev \
+	libncurses-dev \
 	libssl-dev \
+	libuv-dev \
 	pkg-config \
+	strace \
 	&& rm -rf /var/lib/apt/lists/*
 
 CMD /bin/bash
diff --git a/docker/build-pb b/docker/build-pb
index 6ed2af6..1d87fb4 100755
--- 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}"
-	docker_args="${docker_base_args}"
+	docker_args="${docker_base_args} --privileged"
 	run_cmd "docker run -it ${docker_args} ${DOCKER_TAG} /bin/bash"
 	exit
 fi
diff --git a/docker/builder-include b/docker/builder-include
index d2d94a4..4f42e2c 100644
--- a/docker/builder-include
+++ b/docker/builder-include
@@ -50,7 +50,7 @@  show_tag () {
 	echo "${DOCKER_TAG}"
 }
 
-: ${VERSION:="2"}
+: ${VERSION:="3"}
 : ${ARCH_TAG:="$(arch_tag)"}
 : ${DOCKER_NAME:="pb-builder"}
 : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"}