aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-03-18 16:33:58 -0700
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-03-18 16:33:58 -0700
commit8090150911d508d3b861f25d124b7b48462ad8d2 (patch)
tree124cd196ae54a5ab24387f3c3874d7a796f78a05 /tools
parent55977aa487fedda9dbdccf36d7a6a7c83377b018 (diff)
parentf09f020a491f921fd4e3b1595e858a3f3aab11af (diff)
Merge pull request #5783 from dgquintas/nanopb-dockerfile
Moved apt-gets from .sh file to dockerfile for nanopb
Diffstat (limited to 'tools')
-rwxr-xr-xtools/distrib/check_nanopb_output.sh2
-rw-r--r--tools/dockerfile/test/sanity/Dockerfile8
2 files changed, 7 insertions, 3 deletions
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
#===================