work on docker scripts

13 files changed, 85 insertions, 72 deletions

diff --git a/packaging/debian-docker/anastasis-build.sh b/packaging/debian-docker/anastasis-build.sh
index 2f1d533..5320873 100644
--- a/packaging/debian-docker/anastasis-build.sh
+++ b/packaging/debian-docker/anastasis-build.sh
@@ -5,16 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/anastasis
+cd /build/anastasis
 
 # Fetch source
-rm -rf anastasis anastasis-gtk
-git clone git://git.taler.net/anastasis
-git clone git://git.taler.net/anastasis-gtk
+rm -rf *
 
 for n in anastasis anastasis-gtk
 do
+    git clone git://git.taler.net/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -22,5 +21,6 @@ do
     dpkg -i *.deb
 done
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/debian-docker/gnunet-build.sh b/packaging/debian-docker/gnunet-build.sh
index a37bff7..764e633 100644
--- a/packaging/debian-docker/gnunet-build.sh
+++ b/packaging/debian-docker/gnunet-build.sh
@@ -5,16 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/gnunet
+cd /build/gnunet
 
 # Fetch source
-rm -rf gnunet gnunet-gtk
-git clone git://git.gnunet.org/gnunet
-git clone git://git.gnunet.org/gnunet-gtk
+rm -rf *
 
 for n in gnunet gnunet-gtk
 do
+    git clone git://git.gnunet.org/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -22,5 +21,6 @@ do
     dpkg -i *.deb
 done
 
-rm -rf packages.tgz
-tar cvf packages.tgz *.deb
+tar cvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/debian-docker/run.sh b/packaging/debian-docker/run.sh
index c03607b..a6df3f0 100755
--- a/packaging/debian-docker/run.sh
+++ b/packaging/debian-docker/run.sh
@@ -4,12 +4,17 @@ CONTAINER=$USER/debbuilder:latest
 docker build -t $CONTAINER .
 rm -rf dist
 mkdir dist
-docker run --read-only $CONTAINER sleep 5 &
+docker run --read-only $CONTAINER sleep 100 &
 sleep 1
-ID=`docker container ls | grep $CONTAINER | awk '{print $1}`
+docker container ls
+ID=`docker container ls | grep $CONTAINER | head -n1 | awk '{print $1}'`
+echo "Extracting files from $ID"
 docker cp "$ID:/build/packages.tgz" .
-docker stop $CONTAINER
+echo "Stopping $CONTAINER ($ID)"
+docker container stop $ID
+echo "Removing $CONTAINER"
 docker container rm $ID
+docker image rm $USER/debbuilder
 cd dist
 tar xvf ../packages.tgz
 cd ..
diff --git a/packaging/debian-docker/sync-build.sh b/packaging/debian-docker/sync-build.sh
index 342a702..481dd0d 100644
--- a/packaging/debian-docker/sync-build.sh
+++ b/packaging/debian-docker/sync-build.sh
@@ -5,15 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/sync
+cd /build/sync
 
 # Fetch source
-rm -rf sync
-git clone git://git.taler.net/sync
+rm -rf *
 
 for n in sync
 do
+    git clone git://git.taler.net/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -21,5 +21,6 @@ do
     dpkg -i *.deb
 done
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/debian-docker/taler-build.sh b/packaging/debian-docker/taler-build.sh
index a7bfc62..b366841 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/debian-docker/taler-build.sh
@@ -5,16 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/taler
+cd /build/taler
 
 # Fetch source
-rm -rf exchange merchant
-git clone git://git.taler.net/exchange
-git clone git://git.taler.net/merchant
+rm -rf *
 
 for n in exchange merchant
 do
+    git clone git://git.taler.net/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -22,5 +21,5 @@ do
     dpkg -i *.deb
 done
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+cd ..
diff --git a/packaging/debian-docker/wallet-build.sh b/packaging/debian-docker/wallet-build.sh
index f8ad8d4..030873f 100644
--- a/packaging/debian-docker/wallet-build.sh
+++ b/packaging/debian-docker/wallet-build.sh
@@ -5,11 +5,11 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/wallet
+cd /build/wallet
 
 # Fetch source
-rm -rf wallet-core
+rm -rf *
 git clone git://git.taler.net/wallet-core
 
 cd wallet-core
@@ -19,5 +19,6 @@ make install
 dpkg-buildpackage -rfakeroot -b -uc -us
 cd ..
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index dd68501..937a8e3 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -30,6 +30,7 @@ RUN apt-get update
 RUN apt-get -y upgrade
 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
diff --git a/packaging/ubuntu-docker/anastasis-build.sh b/packaging/ubuntu-docker/anastasis-build.sh
index 2f1d533..5320873 100644
--- a/packaging/ubuntu-docker/anastasis-build.sh
+++ b/packaging/ubuntu-docker/anastasis-build.sh
@@ -5,16 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/anastasis
+cd /build/anastasis
 
 # Fetch source
-rm -rf anastasis anastasis-gtk
-git clone git://git.taler.net/anastasis
-git clone git://git.taler.net/anastasis-gtk
+rm -rf *
 
 for n in anastasis anastasis-gtk
 do
+    git clone git://git.taler.net/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -22,5 +21,6 @@ do
     dpkg -i *.deb
 done
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/ubuntu-docker/gnunet-build.sh b/packaging/ubuntu-docker/gnunet-build.sh
index a37bff7..764e633 100644
--- a/packaging/ubuntu-docker/gnunet-build.sh
+++ b/packaging/ubuntu-docker/gnunet-build.sh
@@ -5,16 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/gnunet
+cd /build/gnunet
 
 # Fetch source
-rm -rf gnunet gnunet-gtk
-git clone git://git.gnunet.org/gnunet
-git clone git://git.gnunet.org/gnunet-gtk
+rm -rf *
 
 for n in gnunet gnunet-gtk
 do
+    git clone git://git.gnunet.org/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -22,5 +21,6 @@ do
     dpkg -i *.deb
 done
 
-rm -rf packages.tgz
-tar cvf packages.tgz *.deb
+tar cvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/ubuntu-docker/run.sh b/packaging/ubuntu-docker/run.sh
index 2152cce..a6df3f0 100755
--- a/packaging/ubuntu-docker/run.sh
+++ b/packaging/ubuntu-docker/run.sh
@@ -1,15 +1,20 @@
 #!/bin/sh
 set -eu
-CONTAINER=$USER/ububuilder:latest
+CONTAINER=$USER/debbuilder:latest
 docker build -t $CONTAINER .
 rm -rf dist
 mkdir dist
-docker start $CONTAINER
-#sleep 1
-ID=`docker container ls -n1 | grep $CONTAINER | awk '{print $1}`
+docker run --read-only $CONTAINER sleep 100 &
+sleep 1
+docker container ls
+ID=`docker container ls | grep $CONTAINER | head -n1 | awk '{print $1}'`
+echo "Extracting files from $ID"
 docker cp "$ID:/build/packages.tgz" .
-docker stop $CONTAINER
+echo "Stopping $CONTAINER ($ID)"
+docker container stop $ID
+echo "Removing $CONTAINER"
 docker container rm $ID
+docker image rm $USER/debbuilder
 cd dist
 tar xvf ../packages.tgz
 cd ..
diff --git a/packaging/ubuntu-docker/sync-build.sh b/packaging/ubuntu-docker/sync-build.sh
index 342a702..481dd0d 100644
--- a/packaging/ubuntu-docker/sync-build.sh
+++ b/packaging/ubuntu-docker/sync-build.sh
@@ -5,15 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/sync
+cd /build/sync
 
 # Fetch source
-rm -rf sync
-git clone git://git.taler.net/sync
+rm -rf *
 
 for n in sync
 do
+    git clone git://git.taler.net/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -21,5 +21,6 @@ do
     dpkg -i *.deb
 done
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/ubuntu-docker/taler-build.sh b/packaging/ubuntu-docker/taler-build.sh
index a7bfc62..b366841 100644
--- a/packaging/ubuntu-docker/taler-build.sh
+++ b/packaging/ubuntu-docker/taler-build.sh
@@ -5,16 +5,15 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/taler
+cd /build/taler
 
 # Fetch source
-rm -rf exchange merchant
-git clone git://git.taler.net/exchange
-git clone git://git.taler.net/merchant
+rm -rf *
 
 for n in exchange merchant
 do
+    git clone git://git.taler.net/$n
     cd $n
     ./bootstrap
     dpkg-buildpackage -rfakeroot -b -uc -us
@@ -22,5 +21,5 @@ do
     dpkg -i *.deb
 done
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+cd ..
diff --git a/packaging/ubuntu-docker/wallet-build.sh b/packaging/ubuntu-docker/wallet-build.sh
index f8ad8d4..030873f 100644
--- a/packaging/ubuntu-docker/wallet-build.sh
+++ b/packaging/ubuntu-docker/wallet-build.sh
@@ -5,11 +5,11 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build
-cd /build
+mkdir -p /build/wallet
+cd /build/wallet
 
 # Fetch source
-rm -rf wallet-core
+rm -rf *
 git clone git://git.taler.net/wallet-core
 
 cd wallet-core
@@ -19,5 +19,6 @@ make install
 dpkg-buildpackage -rfakeroot -b -uc -us
 cd ..
 
-rm -f packages.tgz
-tar cvf packages.tgz *.deb
+tar uvf ../packages.tgz *.deb
+
+cd ..