summaryrefslogtreecommitdiff
path: root/packaging/ubuntu-docker
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/ubuntu-docker')
-rw-r--r--packaging/ubuntu-docker/Dockerfile3
-rw-r--r--packaging/ubuntu-docker/debbuild.sh5
-rwxr-xr-xpackaging/ubuntu-docker/run.sh7
3 files changed, 11 insertions, 4 deletions
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index feb32bc..5946c13 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -16,7 +16,9 @@ RUN apt-get -y install python3-jinja2 doxygen libjose-dev iproute2 sudo
RUN apt-get -y install wget zile
RUN apt-get -y install libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx
RUN apt-get -y install libgtk-3-dev libgladeui-dev libmagic-dev
+RUN apt-get -y install dbconfig-no-thanks
+RUN pip install sphinx_rtd_theme
RUN npm install -g npm
RUN /usr/local/bin/npm install -g npm pnpm node
@@ -26,4 +28,3 @@ RUN apt-key add /root/taler-systems.gpg.key
COPY debbuild.sh /root
RUN chmod +x /root/debbuild.sh
-RUN /root/debbuild.sh
diff --git a/packaging/ubuntu-docker/debbuild.sh b/packaging/ubuntu-docker/debbuild.sh
index 7c46f89..b395212 100644
--- a/packaging/ubuntu-docker/debbuild.sh
+++ b/packaging/ubuntu-docker/debbuild.sh
@@ -5,10 +5,15 @@
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
diff --git a/packaging/ubuntu-docker/run.sh b/packaging/ubuntu-docker/run.sh
index 44f35cc..dbf1706 100755
--- a/packaging/ubuntu-docker/run.sh
+++ b/packaging/ubuntu-docker/run.sh
@@ -4,12 +4,13 @@ CONTAINER=$USER/debbuilder:latest
docker build -t $CONTAINER .
rm -rf dist
mkdir dist
-docker run --name fx $CONTAINER sleep 5 &
+docker run --name ufx $CONTAINER /root/debbuild.sh
+docker run --name ufx $CONTAINER sleep 5 &
DOCKPID=$!
sleep 1
-docker cp "fx:/build/packages.tgz" .
+docker cp "ufx:/build/packages.tgz" .
wait $DOCKPID
-docker rm fx
+docker rm ufx
cd dist
tar xvf ../packages.tgz
cd ..