moved apt-gets from .sh file to dockerfile for nanopb

9 years ago · b84571840a
parent 91bd67cb33
commit b84571840a
3 changed files with 8 additions and 4 deletions
--- 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

  #===================
--- 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
--- a/tools/dockerfile/test/sanity/Dockerfile
+++ b/tools/dockerfile/test/sanity/Dockerfile
@ -65,7 +65,7 @@ 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

 #===================