From 9dba70f65252ea636af27bfcaed88e388ca11a4e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 9 Sep 2023 15:15:41 +0200 Subject: update package builders --- packaging/debian-docker/Dockerfile | 17 +++++------------ packaging/ubuntu-docker/Dockerfile | 14 ++++---------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile index c5cda33..73b9695 100644 --- a/packaging/debian-docker/Dockerfile +++ b/packaging/debian-docker/Dockerfile @@ -11,21 +11,14 @@ 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 -RUN apt-get -y install 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 -RUN apt-get -y install libzbar-dev default-libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev -RUN apt-get -y install python3-jinja2 doxygen libjose-dev iproute2 sudo python3-sphinx-rtd-theme -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 policykit-1 -RUN apt-get -y install libnfc-dev +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 python3-click python3-requests python3 - -RUN apt-get -y install apt-utils - +RUN apt-get -y install openjdk-17-jdk +# For wallet-core RUN npm install -g pnpm node +# ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache + RUN apt-get update RUN apt-get -y upgrade RUN apt-get -y dist-upgrade diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile index 1fd719f..5b68783 100644 --- a/packaging/ubuntu-docker/Dockerfile +++ b/packaging/ubuntu-docker/Dockerfile @@ -11,17 +11,11 @@ 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 -RUN apt-get -y install 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 -RUN apt-get -y install libzbar-dev libmysqlclient-dev mandoc libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev -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 policykit-1 -RUN apt-get -y install libnfc-dev -# For libeufin: -RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3 python3-sphinx-rtd-theme +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 +# For wallet-core: RUN npm install -g pnpm node RUN apt-get update -- cgit v1.2.3