commit 876fdea061f813b1524a7f7a89dfd60c4144f18d parent 5b914fdbd309515d62cb1fc343dd7c8bd93d3981 Author: Christian Grothoff <grothoff@gnunet.org> Date: Sat, 10 Feb 2024 19:44:26 +0100 work on packaging Diffstat:
16 files changed, 84 insertions(+), 94 deletions(-)
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile @@ -11,17 +11,12 @@ ARG DEBIAN_FRONTEND=noninteractive # Install dependencies 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-headless default-jre-headless -# For wallet-core -RUN npm install -g node pnpm - RUN apt-get update -RUN apt-get -y upgrade RUN apt-get -y dist-upgrade +RUN apt-get update +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 openjdk-17-jdk-headless default-jre-headless +RUN npm install -g node pnpm -ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache COPY libeufin-build.sh /root/ RUN chmod +x /root/libeufin-build.sh diff --git a/packaging/ubuntu-jammy-docker/Dockerfile b/packaging/ubuntu-jammy-docker/Dockerfile @@ -1,57 +0,0 @@ -FROM ubuntu:jammy -# This file is in the public domain. -# -# Docker image to build Ubuntu packages of -# GNUnet, GNU Taler and GNU Anastasis. -# -# We need 'kinetic' for a reasonably recent NodeJS version. - -ARG DEBIAN_FRONTEND=noninteractive - -# Install dependencies -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm autoconf automake gcc-12 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 -# For wallet-core: -RUN npm install -g node pnpm - -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 master - -COPY gnunet-gtk-build.sh /root/ -RUN chmod +x /root/gnunet-gtk-build.sh -RUN /root/gnunet-gtk-build.sh master - -COPY exchange-build.sh /root/ -RUN chmod +x /root/exchange-build.sh -RUN /root/exchange-build.sh master - -COPY merchant-build.sh /root/ -RUN chmod +x /root/merchant-build.sh -RUN /root/merchant-build.sh master - -COPY sync-build.sh /root/ -RUN chmod +x /root/sync-build.sh -RUN /root/sync-build.sh master - -COPY anastasis-build.sh /root/ -RUN chmod +x /root/anastasis-build.sh -RUN /root/anastasis-build.sh master - -# No wallet on Jammy -#COPY wallet-build.sh /root/ -#RUN chmod +x /root/wallet-build.sh -#RUN /root/wallet-build.sh master - -#COPY libeufin-build.sh /root/ -#RUN chmod +x /root/libeufin-build.sh -#RUN /root/libeufin-build.sh master diff --git a/packaging/ubuntu-jammy-docker/gnunet-build.sh b/packaging/ubuntu-jammy-docker/gnunet-build.sh @@ -1,29 +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 - -mkdir -p /build/gnunet -cd /build/gnunet - -# Fetch source -rm -rf * - -pip3 install sphinx-book-theme - -for n in gnunet -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 .. diff --git a/packaging/ubuntu-mantic-docker/Dockerfile b/packaging/ubuntu-mantic-docker/Dockerfile @@ -0,0 +1,52 @@ +FROM ubuntu:mantic +# This file is in the public domain. +# +# Docker image to build Ubuntu packages of +# GNUnet, GNU Taler and GNU Anastasis. +# +# We need 'kinetic' for a reasonably recent NodeJS version. + +ARG DEBIAN_FRONTEND=noninteractive + +# Install dependencies +RUN apt-get update +RUN apt-get -y upgrade +RUN apt-get update +RUN apt-get -y dist-upgrade +RUN apt-get update +RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm autoconf automake gcc-12 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 openjdk-17-jdk +RUN npm install -g node pnpm + +# 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 master + +COPY gnunet-gtk-build.sh /root/ +RUN chmod +x /root/gnunet-gtk-build.sh +RUN /root/gnunet-gtk-build.sh master + +COPY exchange-build.sh /root/ +RUN chmod +x /root/exchange-build.sh +RUN /root/exchange-build.sh master + +COPY merchant-build.sh /root/ +RUN chmod +x /root/merchant-build.sh +RUN /root/merchant-build.sh master + +COPY sync-build.sh /root/ +RUN chmod +x /root/sync-build.sh +RUN /root/sync-build.sh master + +COPY anastasis-build.sh /root/ +RUN chmod +x /root/anastasis-build.sh +RUN /root/anastasis-build.sh master + +# No wallet on Jammy +#COPY wallet-build.sh /root/ +#RUN chmod +x /root/wallet-build.sh +#RUN /root/wallet-build.sh master + +#COPY libeufin-build.sh /root/ +#RUN chmod +x /root/libeufin-build.sh +#RUN /root/libeufin-build.sh master diff --git a/packaging/ubuntu-jammy-docker/README b/packaging/ubuntu-mantic-docker/README diff --git a/packaging/ubuntu-jammy-docker/anastasis-build.sh b/packaging/ubuntu-mantic-docker/anastasis-build.sh diff --git a/packaging/ubuntu-jammy-docker/exchange-build.sh b/packaging/ubuntu-mantic-docker/exchange-build.sh diff --git a/packaging/ubuntu-mantic-docker/gnunet-build.sh b/packaging/ubuntu-mantic-docker/gnunet-build.sh @@ -0,0 +1,29 @@ +#!/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 * + +pip3 install --break-system-packages sphinx-book-theme + +for n in gnunet +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 .. diff --git a/packaging/ubuntu-jammy-docker/gnunet-gtk-build.sh b/packaging/ubuntu-mantic-docker/gnunet-gtk-build.sh diff --git a/packaging/ubuntu-jammy-docker/libeufin-build.sh b/packaging/ubuntu-mantic-docker/libeufin-build.sh diff --git a/packaging/ubuntu-jammy-docker/mdb-build.sh b/packaging/ubuntu-mantic-docker/mdb-build.sh diff --git a/packaging/ubuntu-jammy-docker/merchant-build.sh b/packaging/ubuntu-mantic-docker/merchant-build.sh diff --git a/packaging/ubuntu-jammy-docker/run.sh b/packaging/ubuntu-mantic-docker/run.sh diff --git a/packaging/ubuntu-jammy-docker/sync-build.sh b/packaging/ubuntu-mantic-docker/sync-build.sh diff --git a/packaging/ubuntu-jammy-docker/taler.list b/packaging/ubuntu-mantic-docker/taler.list diff --git a/packaging/ubuntu-jammy-docker/wallet-build.sh b/packaging/ubuntu-mantic-docker/wallet-build.sh