Mercurial > hg > sonic-visualiser
changeset 2353:6845d7dafebf sv_v4.0pre2
Bitbucket -> Sourcehut
| author | Chris Cannam |
|---|---|
| date | Wed, 09 Oct 2019 15:17:57 +0100 |
| parents | bc4205d70e8b |
| children | ec88bcdc5a5b |
| files | deploy/linux/build-and-test-appimage.sh deploy/linux/build-and-test-deb.sh deploy/linux/docker/Dockerfile_appimage.in deploy/linux/docker/Dockerfile_deb.in |
| diffstat | 4 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/linux/build-and-test-appimage.sh Wed Oct 09 14:57:51 2019 +0100 +++ b/deploy/linux/build-and-test-appimage.sh Wed Oct 09 15:17:57 2019 +0100 @@ -24,10 +24,10 @@ 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 +fgrep 'hg.sr.ht' ~/.ssh/known_hosts > "$dockerdir"/known_hosts +cp ~/.ssh/id_rsa_build "$dockerdir"/id_rsa_build +chmod 600 "$dockerdir"/known_hosts "$dockerdir"/id_rsa_build +trap "rm $dockerdir/known_hosts $dockerdir/id_rsa_build" 0 dockertag="cannam/sonic-visualiser-appimage-$current"
--- a/deploy/linux/build-and-test-deb.sh Wed Oct 09 14:57:51 2019 +0100 +++ b/deploy/linux/build-and-test-deb.sh Wed Oct 09 15:17:57 2019 +0100 @@ -27,10 +27,10 @@ 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 +fgrep 'hg.sr.ht' ~/.ssh/known_hosts > "$dockerdir"/known_hosts +cp ~/.ssh/id_rsa_build "$dockerdir"/id_rsa_build +chmod 600 "$dockerdir"/known_hosts "$dockerdir"/id_rsa_build +trap "rm $dockerdir/known_hosts $dockerdir/id_rsa_build" 0 dockertag="cannam/sonic-visualiser-deb-$current"
--- a/deploy/linux/docker/Dockerfile_appimage.in Wed Oct 09 14:57:51 2019 +0100 +++ b/deploy/linux/docker/Dockerfile_appimage.in Wed Oct 09 15:17:57 2019 +0100 @@ -59,11 +59,11 @@ WORKDIR /root -COPY id_dsa_build .ssh/id_dsa_build +COPY id_rsa_build .ssh/id_rsa_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 +RUN chmod 600 .ssh/id_rsa_build .ssh/known_hosts +RUN echo '{"accounts": {"sourcehut": "~breakfastquay"}}' > .repoint.json +RUN ( echo '[ui]' ; echo 'ssh = ssh -i /root/.ssh/id_rsa_build' ) > .hgrc WORKDIR /sonic-visualiser ENV QTDIR /opt/qt510
--- a/deploy/linux/docker/Dockerfile_deb.in Wed Oct 09 14:57:51 2019 +0100 +++ b/deploy/linux/docker/Dockerfile_deb.in Wed Oct 09 15:17:57 2019 +0100 @@ -49,11 +49,11 @@ WORKDIR /root -COPY id_dsa_build .ssh/id_dsa_build +COPY id_rsa_build .ssh/id_rsa_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 +RUN chmod 600 .ssh/id_rsa_build .ssh/known_hosts +RUN echo '{"accounts": {"sourcehut": "~breakfastquay"}}' > .repoint.json +RUN ( echo '[ui]' ; echo 'ssh = ssh -i /root/.ssh/id_rsa_build' ) > .hgrc RUN rm -f /usr/lib/x86_64-linux-gnu/librubberband.so*