summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <grothoff@gnunet.org>2023-12-08 00:16:10 +0900
committerChristian Grothoff <grothoff@gnunet.org>2023-12-08 00:16:24 +0900
commit1a000c2421de256cdd2062db4ce3ea0df4810b3f (patch)
treefdc510ee4f79fcb4987ed2f9947e4943eb203418
parent28e09a4c18bd308faa0e9eebfc57a3fa9dab13cb (diff)
downloaddeployment-1a000c2421de256cdd2062db4ce3ea0df4810b3f.tar.gz
deployment-1a000c2421de256cdd2062db4ce3ea0df4810b3f.tar.bz2
deployment-1a000c2421de256cdd2062db4ce3ea0df4810b3f.zip
re-enable for reproduction
-rw-r--r--packaging/debian-docker/Dockerfile2
-rw-r--r--packaging/debian-docker/libeufin-build.sh1
-rw-r--r--packaging/ubuntu-docker/Dockerfile2
-rw-r--r--packaging/ubuntu-docker/libeufin-build.sh1
4 files changed, 4 insertions, 2 deletions
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile
index b667d48..8ae341a 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update
RUN apt-get -y upgrade
RUN apt-get -y install build-essential zip jq python3 python3-pip autoconf automake gcc make libtool libltdl-dev libmicrohttpd-dev libpq-dev libsqlite3-dev libunistring-dev libqrencode-dev libgcrypt-dev libsodium-dev libargon2-dev libjansson-dev recutils libgmp-dev texinfo pkgconf zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev autopoint linux-libc-dev python3-sphinx python3-sphinxcontrib.httpdomain policykit-1 libzbar-dev default-libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev python3-jinja2 doxygen libjose-dev iproute2 sudo python3-sphinx-rtd-theme wget zile libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 libnfc-dev python3-click python3-requests apt-utils nodejs npm
# For libeufin:
-RUN apt-get -y install openjdk-17-jdk
+RUN apt-get -y install openjdk-17-jdk default-jre-headless
# For wallet-core
RUN npm install -g node pnpm
diff --git a/packaging/debian-docker/libeufin-build.sh b/packaging/debian-docker/libeufin-build.sh
index 9e0a067..eb440f2 100644
--- a/packaging/debian-docker/libeufin-build.sh
+++ b/packaging/debian-docker/libeufin-build.sh
@@ -15,6 +15,7 @@ git checkout $1
./bootstrap
export JAVA_HOME=/usr
./configure --prefix=/usr
+make install
make deb
cd ..
dpkg -i *.deb
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index d557707..89718f7 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get -y upgrade
RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm autoconf automake gcc make libtool libltdl-dev libmicrohttpd-dev libpq-dev libsqlite3-dev libunistring-dev libqrencode-dev libgcrypt-dev libsodium-dev libargon2-dev libjansson-dev recutils libgmp-dev texinfo pkgconf zlib1g-dev libopus-dev libextractor-dev libnss3-dev libcurl4-gnutls-dev autopoint libzbar-dev libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev python3-jinja2 doxygen libjose-dev iproute2 sudo wget zile libogg-dev gettext net-tools po-debconf debhelper-compat dbconfig-pgsql nginx libgtk-3-dev libgladeui-dev libmagic-dev policykit-1 libnfc-dev python3-click python3-requests python3-sphinx-rtd-theme
# For libeufin:
-RUN apt-get -y install openjdk-17-jdk
+RUN apt-get -y install openjdk-17-jdk default-jre-headless
# For wallet-core:
RUN npm install -g node pnpm
diff --git a/packaging/ubuntu-docker/libeufin-build.sh b/packaging/ubuntu-docker/libeufin-build.sh
index d383625..75713ab 100644
--- a/packaging/ubuntu-docker/libeufin-build.sh
+++ b/packaging/ubuntu-docker/libeufin-build.sh
@@ -15,6 +15,7 @@ git checkout $1
./bootstrap
export JAVA_HOME=/usr
./configure --prefix=/usr
+make install
make deb
cd ..
dpkg -i *.deb