changeset 2120:295b6a146f1c

Deb fixes
author Chris Cannam
date Wed, 21 Nov 2018 12:30:40 +0000
parents 914ddb643616
children 0f5ff52655ec ac587ccb08bd
files deploy/linux/docker/Dockerfile_deb.in deploy/linux/docker/Dockerfile_test_deb.in
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/linux/docker/Dockerfile_deb.in	Wed Nov 21 11:55:01 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_deb.in	Wed Nov 21 12:30:40 2018 +0000
@@ -47,7 +47,7 @@
 WORKDIR capnproto
 RUN git checkout v0.6.1
 WORKDIR c++
-RUN autoreconf -i && ./configure && make -j3 && make install
+RUN autoreconf -i && ./configure --enable-shared=no --enable-static=yes && make -j3 && make install
 
 WORKDIR ../../sonic-visualiser
 RUN ./configure
--- a/deploy/linux/docker/Dockerfile_test_deb.in	Wed Nov 21 11:55:01 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_test_deb.in	Wed Nov 21 12:30:40 2018 +0000
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 RUN apt-get update
 ADD output/sonic-visualiser_[[RELEASE]]_amd64.deb sonic-visualiser_[[RELEASE]]_amd64.deb
-RUN apt install sonic-visualiser_[[RELEASE]]_amd64.deb
+RUN apt install -y ./sonic-visualiser_[[RELEASE]]_amd64.deb
 RUN /usr/bin/sonic-visualiser --version