-update ubu deb builder

9 files changed, 153 insertions, 53 deletions

diff --git a/packaging/debian-docker/taler-build.sh b/packaging/debian-docker/taler-build.sh
index 6425870..a7bfc62 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/debian-docker/taler-build.sh
@@ -5,7 +5,7 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir /build
+mkdir -p /build
 cd /build
 
 # Fetch source
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index 5946c13..dd68501 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -26,5 +26,22 @@ COPY taler.list /etc/apt/sources.list.d/
 COPY taler-systems.gpg.key /root
 RUN apt-key add /root/taler-systems.gpg.key
 
-COPY debbuild.sh /root
-RUN chmod +x /root/debbuild.sh
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get -y dist-upgrade
+
+COPY gnunet-build.sh /root/
+RUN chmod +x /root/gnunet-build.sh
+RUN /root/gnunet-build.sh
+COPY taler-build.sh /root/
+RUN chmod +x /root/taler-build.sh
+RUN /root/taler-build.sh
+COPY sync-build.sh /root/
+RUN chmod +x /root/sync-build.sh
+RUN /root/sync-build.sh
+COPY anastasis-build.sh /root/
+RUN chmod +x /root/anastasis-build.sh
+RUN /root/anastasis-build.sh
+COPY wallet-build.sh /root/
+RUN chmod +x /root/wallet-build.sh
+RUN /root/wallet-build.sh
diff --git a/packaging/ubuntu-docker/anastasis-build.sh b/packaging/ubuntu-docker/anastasis-build.sh
new file mode 100644
index 0000000..2f1d533
--- /dev/null
+++ b/packaging/ubuntu-docker/anastasis-build.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+
+mkdir -p /build
+cd /build
+
+# Fetch source
+rm -rf anastasis anastasis-gtk
+git clone git://git.taler.net/anastasis
+git clone git://git.taler.net/anastasis-gtk
+
+for n in anastasis anastasis-gtk
+do
+    cd $n
+    ./bootstrap
+    dpkg-buildpackage -rfakeroot -b -uc -us
+    cd ..
+    dpkg -i *.deb
+done
+
+rm -f packages.tgz
+tar cvf packages.tgz *.deb
diff --git a/packaging/ubuntu-docker/debbuild.sh b/packaging/ubuntu-docker/debbuild.sh
deleted file mode 100644
index b395212..0000000
--- a/packaging/ubuntu-docker/debbuild.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# This file is in the public domain.
-# Helper script to build the latest DEB packages in the container.
-
-set -eu
-unset LD_LIBRARY_PATH
-
-apt update
-apt upgrade
-apt dist-upgrade
-
-mkdir /build
-cd /build
-
-# Fetch source
-rm -rf *
-git clone git://git.gnunet.org/gnunet
-git clone git://git.gnunet.org/gnunet-gtk
-git clone git://git.taler.net/exchange
-git clone git://git.taler.net/merchant
-git clone git://git.taler.net/sync
-git clone git://git.taler.net/anastasis
-git clone git://git.taler.net/anastasis-gtk
-git clone git://git.taler.net/wallet-core
-
-for n in gnunet gnunet-gtk exchange merchant sync anastasis anastasis-gtk
-do
-    cd $n
-    ./bootstrap
-    dpkg-buildpackage -rfakeroot -b -uc -us
-    cd ..
-    dpkg -i *.deb
-done
-
-cd wallet-core
-./bootstrap
-./configure --prefix=/usr
-make install
-dpkg-buildpackage -rfakeroot -b -uc -us
-cd ..
-
-tar cvf packages.tgz *.deb
diff --git a/packaging/ubuntu-docker/gnunet-build.sh b/packaging/ubuntu-docker/gnunet-build.sh
new file mode 100644
index 0000000..a37bff7
--- /dev/null
+++ b/packaging/ubuntu-docker/gnunet-build.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+
+mkdir -p /build
+cd /build
+
+# Fetch source
+rm -rf gnunet gnunet-gtk
+git clone git://git.gnunet.org/gnunet
+git clone git://git.gnunet.org/gnunet-gtk
+
+for n in gnunet gnunet-gtk
+do
+    cd $n
+    ./bootstrap
+    dpkg-buildpackage -rfakeroot -b -uc -us
+    cd ..
+    dpkg -i *.deb
+done
+
+rm -rf packages.tgz
+tar cvf packages.tgz *.deb
diff --git a/packaging/ubuntu-docker/run.sh b/packaging/ubuntu-docker/run.sh
index dbf1706..2152cce 100755
--- a/packaging/ubuntu-docker/run.sh
+++ b/packaging/ubuntu-docker/run.sh
@@ -1,16 +1,15 @@
 #!/bin/sh
 set -eu
-CONTAINER=$USER/debbuilder:latest
+CONTAINER=$USER/ububuilder:latest
 docker build -t $CONTAINER .
 rm -rf dist
 mkdir dist
-docker run --name ufx $CONTAINER /root/debbuild.sh
-docker run --name ufx $CONTAINER sleep 5 &
-DOCKPID=$!
-sleep 1
-docker cp "ufx:/build/packages.tgz" .
-wait $DOCKPID
-docker rm ufx
+docker start $CONTAINER
+#sleep 1
+ID=`docker container ls -n1 | grep $CONTAINER | awk '{print $1}`
+docker cp "$ID:/build/packages.tgz" .
+docker stop $CONTAINER
+docker container rm $ID
 cd dist
 tar xvf ../packages.tgz
 cd ..
diff --git a/packaging/ubuntu-docker/sync-build.sh b/packaging/ubuntu-docker/sync-build.sh
new file mode 100644
index 0000000..342a702
--- /dev/null
+++ b/packaging/ubuntu-docker/sync-build.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+
+mkdir -p /build
+cd /build
+
+# Fetch source
+rm -rf sync
+git clone git://git.taler.net/sync
+
+for n in sync
+do
+    cd $n
+    ./bootstrap
+    dpkg-buildpackage -rfakeroot -b -uc -us
+    cd ..
+    dpkg -i *.deb
+done
+
+rm -f packages.tgz
+tar cvf packages.tgz *.deb
diff --git a/packaging/ubuntu-docker/taler-build.sh b/packaging/ubuntu-docker/taler-build.sh
new file mode 100644
index 0000000..a7bfc62
--- /dev/null
+++ b/packaging/ubuntu-docker/taler-build.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+
+mkdir -p /build
+cd /build
+
+# Fetch source
+rm -rf exchange merchant
+git clone git://git.taler.net/exchange
+git clone git://git.taler.net/merchant
+
+for n in exchange merchant
+do
+    cd $n
+    ./bootstrap
+    dpkg-buildpackage -rfakeroot -b -uc -us
+    cd ..
+    dpkg -i *.deb
+done
+
+rm -f packages.tgz
+tar cvf packages.tgz *.deb
diff --git a/packaging/ubuntu-docker/wallet-build.sh b/packaging/ubuntu-docker/wallet-build.sh
new file mode 100644
index 0000000..f8ad8d4
--- /dev/null
+++ b/packaging/ubuntu-docker/wallet-build.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+
+mkdir -p /build
+cd /build
+
+# Fetch source
+rm -rf wallet-core
+git clone git://git.taler.net/wallet-core
+
+cd wallet-core
+./bootstrap
+./configure --prefix=/usr
+make install
+dpkg-buildpackage -rfakeroot -b -uc -us
+cd ..
+
+rm -f packages.tgz
+tar cvf packages.tgz *.deb