# HG changeset patch
# User Chris Cannam
# Date 1543921056 0
# Node ID 3a4202cae7fe06d1483a90f053f9c57c3fad418c
# Parent  27ad597b11807032f274b9fab9fb1f6d5908fa55
Updates to try to resolve bitbucket access problem from old Ubuntu 14.04 image - switching to using a dedicated build ssh key (locally stored, not in the repo!) copied in on demand

diff -r 27ad597b1180 -r 3a4202cae7fe deploy/linux/build-and-test-appimage.sh
--- a/deploy/linux/build-and-test-appimage.sh	Tue Dec 04 10:31:12 2018 +0000
+++ b/deploy/linux/build-and-test-appimage.sh	Tue Dec 04 10:57:36 2018 +0000
@@ -24,6 +24,11 @@
     perl -p -e "s/\[\[REVISION\]\]/$current/g" > \
          "$dockerdir"/Dockerfile_test_appimage.gen
 
+grep '^bitbucket.org' ~/.ssh/known_hosts > "$dockerdir"/known_hosts
+cp ~/.ssh/id_dsa_build "$dockerdir"/id_dsa_build
+chmod 600 "$dockerdir"/known_hosts "$dockerdir"/id_dsa_build
+trap "rm $dockerdir/known_hosts $dockerdir/id_dsa_build" 0
+
 dockertag="cannam/sonic-visualiser-appimage-$current"
 
 sudo docker build -t "$dockertag" -f "$dockerdir"/Dockerfile_appimage.gen "$dockerdir"
diff -r 27ad597b1180 -r 3a4202cae7fe deploy/linux/build-and-test-deb.sh
--- a/deploy/linux/build-and-test-deb.sh	Tue Dec 04 10:31:12 2018 +0000
+++ b/deploy/linux/build-and-test-deb.sh	Tue Dec 04 10:57:36 2018 +0000
@@ -27,6 +27,11 @@
     perl -p -e "s/\[\[RELEASE\]\]/$release/g" > \
          "$dockerdir"/Dockerfile_test_deb.gen
 
+grep '^bitbucket.org' ~/.ssh/known_hosts > "$dockerdir"/known_hosts
+cp ~/.ssh/id_dsa_build "$dockerdir"/id_dsa_build
+chmod 600 "$dockerdir"/known_hosts "$dockerdir"/id_dsa_build
+trap "rm $dockerdir/known_hosts $dockerdir/id_dsa_build" 0
+
 dockertag="cannam/sonic-visualiser-deb-$current"
 
 sudo docker build -t "$dockertag" -f "$dockerdir"/Dockerfile_deb.gen "$dockerdir"
diff -r 27ad597b1180 -r 3a4202cae7fe deploy/linux/docker/Dockerfile_appimage.in
--- a/deploy/linux/docker/Dockerfile_appimage.in	Tue Dec 04 10:31:12 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Tue Dec 04 10:57:36 2018 +0000
@@ -59,7 +59,15 @@
 WORKDIR c++
 RUN autoreconf -i && ./configure && make -j3 && make install
 
-WORKDIR ../../sonic-visualiser
+WORKDIR /root
+
+COPY id_dsa_build .ssh/id_dsa_build
+COPY known_hosts .ssh/known_hosts
+RUN chmod 600 .ssh/id_dsa_build .ssh/known_hosts
+RUN echo '{"accounts": {"bitbucket": "cannam"}}' > .repoint.json
+RUN ( echo '[ui]' ; echo 'ssh = ssh -i /root/.ssh/id_dsa_build' ) > .hgrc
+
+WORKDIR /sonic-visualiser
 ENV QTDIR /opt/qt510
 ENV PATH /opt/qt510/bin:$PATH
 RUN ./configure
diff -r 27ad597b1180 -r 3a4202cae7fe deploy/linux/docker/Dockerfile_deb.in
--- a/deploy/linux/docker/Dockerfile_deb.in	Tue Dec 04 10:31:12 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_deb.in	Tue Dec 04 10:57:36 2018 +0000
@@ -49,7 +49,15 @@
 WORKDIR c++
 RUN autoreconf -i && ./configure --enable-shared=no --enable-static=yes && make -j3 && make install
 
-WORKDIR ../../sonic-visualiser
+WORKDIR /root
+
+COPY id_dsa_build .ssh/id_dsa_build
+COPY known_hosts .ssh/known_hosts
+RUN chmod 600 .ssh/id_dsa_build .ssh/known_hosts
+RUN echo '{"accounts": {"bitbucket": "cannam"}}' > .repoint.json
+RUN ( echo '[ui]' ; echo 'ssh = ssh -i /root/.ssh/id_dsa_build' ) > .hgrc
+
+WORKDIR /sonic-visualiser
 RUN ./configure
 RUN make -j3