diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-08 16:20:30 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-08 16:20:30 +0000 |
| commit | e83a713d1d50325abd5aecfb44f95a94a4fa04ee (patch) | |
| tree | 3d9d7f24347b25cf5fbfbed5e46eecfbbff45098 | |
| parent | 73b77b454cd0af444e4d079495e0940e0443ef7e (diff) | |
tcwg-host: Add docker-stats helper to pretty-print containers.
Change-Id: I070bf9df40c0c341e44b359bb2e722f60fa051ee
| -rw-r--r-- | tcwg-base/tcwg-host/Dockerfile.in | 1 | ||||
| -rwxr-xr-x | tcwg-base/tcwg-host/build.sh | 5 | ||||
| -rwxr-xr-x | tcwg-base/tcwg-host/docker-wrapper | 2 | ||||
| -rw-r--r-- | xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 3 | ||||
| -rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 8d219ba1..cb6e235e 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,6 +1,7 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / diff --git a/tcwg-base/tcwg-host/build.sh b/tcwg-base/tcwg-host/build.sh index f18f3752..6205035d 100755 --- a/tcwg-base/tcwg-host/build.sh +++ b/tcwg-base/tcwg-host/build.sh @@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT cleanup_exit() { - rm -rf docker-wrapper run.sh start.sh + rm -rf docker-stats docker-wrapper run.sh start.sh } export LANG=C @@ -16,7 +16,8 @@ name=$(basename ${PWD} | cut -f3- -d '-') image=linaro/ci-${arch}-${name}-ubuntu:${distro} top=$(git rev-parse --show-toplevel) -cp $top/tcwg-base/tcwg-host/docker-wrapper \ +cp $top/tcwg-base/tcwg-host/docker-stats \ + $top/tcwg-base/tcwg-host/docker-wrapper \ $top/tcwg-base/tcwg-host/run.sh \ $top/tcwg-base/tcwg-host/start.sh ./ diff --git a/tcwg-base/tcwg-host/docker-wrapper b/tcwg-base/tcwg-host/docker-wrapper index 883a8038..2cfea5c9 100755 --- a/tcwg-base/tcwg-host/docker-wrapper +++ b/tcwg-base/tcwg-host/docker-wrapper @@ -1,2 +1,2 @@ #!/bin/sh -sudo /usr/bin/docker "$@" +exec sudo /usr/bin/docker "$@" diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index ba5cd020..48b28d26 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -2,9 +2,10 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 476d3063728acd718302d2d7bad5e711 +# checksum: 9f94a8be2756ffabb6ebafa75127f228 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile index 22a4ea80..34f161bd 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -2,9 +2,10 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 16cc73e3d44c8ab0cae45ab9cf83ab32 +# checksum: 8498aac781566adf4cb5a246369137bd |