From b84571840a590c7b543bb0514a389c9c80740bb6 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 16 Mar 2016 16:46:59 -0700 Subject: [PATCH 1/2] moved apt-gets from .sh file to dockerfile for nanopb --- .../tools/dockerfile/test/sanity/Dockerfile.template | 8 +++++++- tools/distrib/check_nanopb_output.sh | 2 -- tools/dockerfile/test/sanity/Dockerfile | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index ad1d92e7cbd..97063807097 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 5f49ebb93e6..51c4d750412 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 1935f675602..01ca268f84c 100644 --- 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 #=================== From f09f020a491f921fd4e3b1595e858a3f3aab11af Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Thu, 17 Mar 2016 21:54:04 -0700 Subject: [PATCH 2/2] fixed backslashes --- .../tools/dockerfile/test/sanity/Dockerfile.template | 12 ++++++------ tools/dockerfile/test/sanity/Dockerfile | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 97063807097..8265c09afc0 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -34,12 +34,12 @@ <%include file="../../apt_get_basic.include"/> #======================== # Sanity test dependencies - RUN apt-get update && apt-get install -y \ - python-pip \ - autoconf \ - automake \ - libtool \ - curl \ + 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/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 01ca268f84c..4a69cd8c00e 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 autoconf automake libtool curl python-virtualenv +RUN apt-get update && apt-get install -y \ + python-pip \ + autoconf \ + automake \ + libtool \ + curl \ + python-virtualenv RUN pip install simplejson mako #===================