diff options
| author | Geoff Levand <geoff@infradead.org> | 2018-08-08 00:01:09 +0000 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-14 11:09:47 +1000 |
| commit | 1a6bbc3061b0838454d0b849d244775f43e5fcc3 (patch) | |
| tree | 932cd76240660b03b7b252a45667b32909660018 | |
| parent | bf220b175df1f1689626598b286b817bc7749057 (diff) | |
| download | talos-petitboot-1a6bbc3061b0838454d0b849d244775f43e5fcc3.tar.gz talos-petitboot-1a6bbc3061b0838454d0b849d244775f43e5fcc3.zip | |
docker: Add strace for interactive debugging
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
| -rw-r--r-- | docker/Dockerfile.builder | 5 | ||||
| -rwxr-xr-x | docker/build-pb | 2 | ||||
| -rw-r--r-- | docker/builder-include | 2 |
3 files changed, 5 insertions, 4 deletions
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}"} |
