Merge pull request #5783 from dgquintas/nanopb-dockerfile

Moved apt-gets from .sh file to dockerfile for nanopb
pull/5849/head
Jan Tattermusch 9 years ago
commit 8090150911
  1. 8
      templates/tools/dockerfile/test/sanity/Dockerfile.template
  2. 2
      tools/distrib/check_nanopb_output.sh
  3. 8
      tools/dockerfile/test/sanity/Dockerfile

@ -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
#===================

@ -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

@ -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
#===================

Loading…
Cancel
Save