tox-bootstrapd's Dockerfile shouldn't use master branch

2 files changed, 6 insertions, 1 deletions

diff --git a/.travis/tox-bootstrapd-docker b/.travis/tox-bootstrapd-docker
index 9e476b5f..7c12a9d0 100755
--- a/.travis/tox-bootstrapd-docker
+++ b/.travis/tox-bootstrapd-docker
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -exu
+
 # Copy source code to other/bootstrap_daemon/docker/c-toxcore
 OLD_PWD=$PWD
 cd /tmp
@@ -13,7 +15,8 @@ cd other/bootstrap_daemon
 
 # Make Docker container use our current source code instead of master branch
 sed -i "s|WORKDIR /tmp/tox|WORKDIR /tmp/tox\nADD /c-toxcore ./c-toxcore/|g" docker/Dockerfile
-sed -i '/git clone/d' docker/Dockerfile
+sed -i 's|git clone|echo \\\#git clone|g' docker/Dockerfile
+sed -i 's|git checkout|echo \\\#git checkout|g' docker/Dockerfile
 
 cat docker/Dockerfile
 
diff --git a/other/bootstrap_daemon/docker/Dockerfile b/other/bootstrap_daemon/docker/Dockerfile
index 373f61c6..06bf66eb 100644
--- a/other/bootstrap_daemon/docker/Dockerfile
+++ b/other/bootstrap_daemon/docker/Dockerfile
@@ -21,6 +21,8 @@ RUN export BUILD_PACKAGES="\
 # install toxcore and daemon
     git clone https://github.com/TokTok/c-toxcore && \
     cd c-toxcore && \
+    # checkout latest release version
+    git checkout $(git tag --list | grep -P '^v(\d+).(\d+).(\d+)$' | sed "s/v/v /g" | sed "s/\./ /g" | sort -snk4,4 | sort -snk3,3 | sort -snk2,2 | tail -n 1 | sed 's/v /v/g' | sed 's/ /\./g') && \
     ./autogen.sh && \
     ./configure --enable-daemon && \
     make -j`nproc` && \