-fix docker builds

11 files changed, 24 insertions, 10 deletions

diff --git a/packaging/debian-docker/anastasis-build.sh b/packaging/debian-docker/anastasis-build.sh
index 5320873..24643e1 100644
--- a/packaging/debian-docker/anastasis-build.sh
+++ b/packaging/debian-docker/anastasis-build.sh
@@ -15,6 +15,7 @@ for n in anastasis anastasis-gtk
 do
     git clone git://git.taler.net/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/debian-docker/gnunet-build.sh b/packaging/debian-docker/gnunet-build.sh
index 764e633..dd89abd 100644
--- a/packaging/debian-docker/gnunet-build.sh
+++ b/packaging/debian-docker/gnunet-build.sh
@@ -15,6 +15,7 @@ for n in gnunet gnunet-gtk
 do
     git clone git://git.gnunet.org/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/debian-docker/sync-build.sh b/packaging/debian-docker/sync-build.sh
index 481dd0d..e38a0ee 100644
--- a/packaging/debian-docker/sync-build.sh
+++ b/packaging/debian-docker/sync-build.sh
@@ -15,6 +15,7 @@ for n in sync
 do
     git clone git://git.taler.net/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/debian-docker/taler-build.sh b/packaging/debian-docker/taler-build.sh
index b366841..2e048f4 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/debian-docker/taler-build.sh
@@ -15,6 +15,7 @@ for n in exchange merchant
 do
     git clone git://git.taler.net/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/debian-docker/wallet-build.sh b/packaging/debian-docker/wallet-build.sh
index 030873f..66f2437 100644
--- a/packaging/debian-docker/wallet-build.sh
+++ b/packaging/debian-docker/wallet-build.sh
@@ -13,12 +13,15 @@ rm -rf *
 git clone git://git.taler.net/wallet-core
 
 cd wallet-core
+git checkout $1
 ./bootstrap
 ./configure --prefix=/usr
+cd packages/taler-wallet-cli
+./configure --prefix=/usr
 make install
 dpkg-buildpackage -rfakeroot -b -uc -us
-cd ..
+cd ../
 
-tar uvf ../packages.tgz *.deb
+tar uvf ../../../packages.tgz *.deb
 
-cd ..
+cd ../../..
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index 937a8e3..3a3440d 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -33,16 +33,16 @@ RUN apt-get -y dist-upgrade
 # ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
 COPY gnunet-build.sh /root/
 RUN chmod +x /root/gnunet-build.sh
-RUN /root/gnunet-build.sh
+RUN /root/gnunet-build.sh v0.18.1-deb
 COPY taler-build.sh /root/
 RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh
+RUN /root/taler-build.sh master
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh
+RUN /root/sync-build.sh master
 COPY anastasis-build.sh /root/
 RUN chmod +x /root/anastasis-build.sh
-RUN /root/anastasis-build.sh
+RUN /root/anastasis-build.sh master
 COPY wallet-build.sh /root/
 RUN chmod +x /root/wallet-build.sh
-RUN /root/wallet-build.sh
+RUN /root/wallet-build.sh master
diff --git a/packaging/ubuntu-docker/anastasis-build.sh b/packaging/ubuntu-docker/anastasis-build.sh
index 5320873..24643e1 100644
--- a/packaging/ubuntu-docker/anastasis-build.sh
+++ b/packaging/ubuntu-docker/anastasis-build.sh
@@ -15,6 +15,7 @@ for n in anastasis anastasis-gtk
 do
     git clone git://git.taler.net/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/ubuntu-docker/gnunet-build.sh b/packaging/ubuntu-docker/gnunet-build.sh
index 764e633..dd89abd 100644
--- a/packaging/ubuntu-docker/gnunet-build.sh
+++ b/packaging/ubuntu-docker/gnunet-build.sh
@@ -15,6 +15,7 @@ for n in gnunet gnunet-gtk
 do
     git clone git://git.gnunet.org/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/ubuntu-docker/sync-build.sh b/packaging/ubuntu-docker/sync-build.sh
index 481dd0d..e38a0ee 100644
--- a/packaging/ubuntu-docker/sync-build.sh
+++ b/packaging/ubuntu-docker/sync-build.sh
@@ -15,6 +15,7 @@ for n in sync
 do
     git clone git://git.taler.net/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/ubuntu-docker/taler-build.sh b/packaging/ubuntu-docker/taler-build.sh
index b366841..2e048f4 100644
--- a/packaging/ubuntu-docker/taler-build.sh
+++ b/packaging/ubuntu-docker/taler-build.sh
@@ -15,6 +15,7 @@ for n in exchange merchant
 do
     git clone git://git.taler.net/$n
     cd $n
+    git checkout $1
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
     cd ..
diff --git a/packaging/ubuntu-docker/wallet-build.sh b/packaging/ubuntu-docker/wallet-build.sh
index 030873f..51c8caf 100644
--- a/packaging/ubuntu-docker/wallet-build.sh
+++ b/packaging/ubuntu-docker/wallet-build.sh
@@ -13,12 +13,15 @@ rm -rf *
 git clone git://git.taler.net/wallet-core
 
 cd wallet-core
+git checkout $1
 ./bootstrap
 ./configure --prefix=/usr
+cd packages/taler-wallet-cli
+./configure --prefix=/usr
 make install
 dpkg-buildpackage -rfakeroot -b -uc -us
 cd ..
 
-tar uvf ../packages.tgz *.deb
+tar uvf ../../../packages.tgz *.deb
 
-cd ..
+cd ../../..