From 2a3d29d429a10b97e1eb93b6cd9d865722703ab8 Mon Sep 17 00:00:00 2001 From: AdamKorcz <44787359+AdamKorcz@users.noreply.github.com> Date: Wed, 22 Apr 2020 16:12:39 +0100 Subject: [PATCH] Suggested fix for broken build (#3693) --- projects/nanopb/Dockerfile | 4 ++++ projects/nanopb/build.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/nanopb/Dockerfile b/projects/nanopb/Dockerfile index d483e2edf..3bd421074 100644 --- a/projects/nanopb/Dockerfile +++ b/projects/nanopb/Dockerfile @@ -19,5 +19,9 @@ MAINTAINER jpa@npb.mail.kapsi.fi RUN apt-get update && apt-get install -y python3-pip git scons wget RUN python3 -m pip install --upgrade pip RUN git clone --depth 1 https://github.com/nanopb/nanopb $SRC/nanopb + +RUN wget "https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh" +RUN bash "Anaconda3-2020.02-Linux-x86_64.sh" -b + COPY build.sh $SRC/ diff --git a/projects/nanopb/build.sh b/projects/nanopb/build.sh index f62dfae14..c73d32f66 100755 --- a/projects/nanopb/build.sh +++ b/projects/nanopb/build.sh @@ -15,8 +15,6 @@ # ################################################################################ -wget "https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh" -bash "Anaconda3-2020.02-Linux-x86_64.sh" -b export PATH=~/anaconda3/bin:$PATH conda install protobuf -y pip3 install grpcio-tools