From b84571840a590c7b543bb0514a389c9c80740bb6 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 16 Mar 2016 16:46:59 -0700 Subject: moved apt-gets from .sh file to dockerfile for nanopb --- tools/dockerfile/test/sanity/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/dockerfile/test') diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 1935f67560..01ca268f84 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 #=================== -- cgit v1.2.3 From f09f020a491f921fd4e3b1595e858a3f3aab11af Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Thu, 17 Mar 2016 21:54:04 -0700 Subject: fixed backslashes --- templates/tools/dockerfile/test/sanity/Dockerfile.template | 12 ++++++------ tools/dockerfile/test/sanity/Dockerfile | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'tools/dockerfile/test') diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 9706380709..8265c09afc 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 01ca268f84..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 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 #=================== -- cgit v1.2.3