summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-03-15 17:16:43 +0100
committerFlorian Dold <florian@dold.me>2023-03-15 22:57:17 +0100
commit26e715230e4461546d5c921aaed20dc7f39f35c6 (patch)
tree810f0768e2dbbe3af518e10c2aa28b47e8fa5dd0
parenteb284333870e71ea72deb3eff93426dec7c1293b (diff)
downloaddeployment-26e715230e4461546d5c921aaed20dc7f39f35c6.tar.gz
deployment-26e715230e4461546d5c921aaed20dc7f39f35c6.tar.bz2
deployment-26e715230e4461546d5c921aaed20dc7f39f35c6.zip
ubuntu-docker: split
-rw-r--r--packaging/ubuntu-docker/.gitignore1
-rw-r--r--packaging/ubuntu-docker/Dockerfile8
-rw-r--r--packaging/ubuntu-docker/gnunet-build.sh2
-rw-r--r--packaging/ubuntu-docker/gnunet-gtk-build.sh27
4 files changed, 35 insertions, 3 deletions
diff --git a/packaging/ubuntu-docker/.gitignore b/packaging/ubuntu-docker/.gitignore
new file mode 100644
index 0000000..849ddff
--- /dev/null
+++ b/packaging/ubuntu-docker/.gitignore
@@ -0,0 +1 @@
+dist/
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index 779bd6e..7e463d0 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -33,7 +33,11 @@ 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 v0.19.3-debian
+RUN /root/gnunet-build.sh v0.19.3-debian-1
+
+COPY gnunet-gtk-build.sh /root/
+RUN chmod +x /root/gnunet-gtk-build.sh
+RUN /root/gnunet-gtk-build.sh v0.19.3-debian
COPY libeufin-build.sh /root/
RUN chmod +x /root/libeufin-build.sh
@@ -45,7 +49,7 @@ RUN /root/exchange-build.sh v0.9.2-debian-3
COPY merchant-build.sh /root/
RUN chmod +x /root/merchant-build.sh
-RUN /root/merchant-build.sh v0.9.2-debian-4
+RUN /root/merchant-build.sh v0.9.2-debian-5
COPY sync-build.sh /root/
RUN chmod +x /root/sync-build.sh
diff --git a/packaging/ubuntu-docker/gnunet-build.sh b/packaging/ubuntu-docker/gnunet-build.sh
index dd89abd..20efe20 100644
--- a/packaging/ubuntu-docker/gnunet-build.sh
+++ b/packaging/ubuntu-docker/gnunet-build.sh
@@ -11,7 +11,7 @@ cd /build/gnunet
# Fetch source
rm -rf *
-for n in gnunet gnunet-gtk
+for n in gnunet
do
git clone git://git.gnunet.org/$n
cd $n
diff --git a/packaging/ubuntu-docker/gnunet-gtk-build.sh b/packaging/ubuntu-docker/gnunet-gtk-build.sh
new file mode 100644
index 0000000..f480c3c
--- /dev/null
+++ b/packaging/ubuntu-docker/gnunet-gtk-build.sh
@@ -0,0 +1,27 @@
+#!/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/gnunet
+cd /build/gnunet
+
+# Fetch source
+rm -rf *
+
+for n in gnunet-gtk
+do
+ git clone git://git.gnunet.org/$n
+ cd $n
+ git checkout $1
+ ./bootstrap
+ dpkg-buildpackage -rfakeroot -b -uc -us
+ cd ..
+ dpkg -i *.deb
+done
+
+tar cvf ../packages.tgz *.deb
+
+cd ..