diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-18 16:33:58 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-18 16:33:58 -0700 |
| commit | 8090150911d508d3b861f25d124b7b48462ad8d2 (patch) | |
| tree | 124cd196ae54a5ab24387f3c3874d7a796f78a05 | |
| parent | 55977aa487fedda9dbdccf36d7a6a7c83377b018 (diff) | |
| parent | f09f020a491f921fd4e3b1595e858a3f3aab11af (diff) | |
Merge pull request #5783 from dgquintas/nanopb-dockerfile
Moved apt-gets from .sh file to dockerfile for nanopb
| -rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 8 | ||||
| -rwxr-xr-x | tools/distrib/check_nanopb_output.sh | 2 | ||||
| -rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index ad1d92e7cb..8265c09afc 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -34,7 +34,13 @@ <%include file="../../apt_get_basic.include"/> #======================== # Sanity test dependencies - RUN apt-get update && apt-get install -y python-pip + RUN apt-get update && apt-get install -y ${"\\"} + python-pip ${"\\"} + autoconf ${"\\"} + automake ${"\\"} + libtool ${"\\"} + curl ${"\\"} + python-virtualenv RUN pip install simplejson mako #=================== diff --git a/tools/distrib/check_nanopb_output.sh b/tools/distrib/check_nanopb_output.sh index 5f49ebb93e..51c4d75041 100755 --- a/tools/distrib/check_nanopb_output.sh +++ b/tools/distrib/check_nanopb_output.sh @@ -30,8 +30,6 @@ set -ex -apt-get install -y autoconf automake libtool curl python-virtualenv - readonly NANOPB_TMP_OUTPUT="$(mktemp -d)" # install protoc version 3 diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 1935f67560..4a69cd8c00 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -65,7 +65,13 @@ RUN apt-get update && apt-get install -y time && apt-get clean #======================== # Sanity test dependencies -RUN apt-get update && apt-get install -y python-pip +RUN apt-get update && apt-get install -y \ + python-pip \ + autoconf \ + automake \ + libtool \ + curl \ + python-virtualenv RUN pip install simplejson mako #=================== |