diff options
| author | Christian Grothoff <christian@grothoff.org> | 2024-04-09 15:03:29 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2024-04-09 15:03:29 +0200 |
| commit | fd8c41e011179ecc0b6dd1665f3275e98ae38c94 (patch) | |
| tree | 36154f2a75ac94a9de8abb0b4c4b4f997b92daa9 | |
| parent | df5e262dd52b7ddc3989747e58067fb1f0f18814 (diff) | |
| download | deployment-fd8c41e011179ecc0b6dd1665f3275e98ae38c94.tar.gz deployment-fd8c41e011179ecc0b6dd1665f3275e98ae38c94.tar.bz2 deployment-fd8c41e011179ecc0b6dd1665f3275e98ae38c94.zip | |
packaging fixes
| -rw-r--r-- | packaging/debian-docker/Dockerfile | 1 | ||||
| -rwxr-xr-x | packaging/debian-docker/run.sh | 2 | ||||
| -rw-r--r-- | packaging/debian-docker/sync-build.sh | 4 | ||||
| -rw-r--r-- | packaging/ubuntu-docker/Dockerfile | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile index 2fe5400..0d6c739 100644 --- a/packaging/debian-docker/Dockerfile +++ b/packaging/debian-docker/Dockerfile @@ -17,6 +17,7 @@ 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 pandoc groff 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/debian-docker/run.sh b/packaging/debian-docker/run.sh index 928abd9..2689a33 100755 --- a/packaging/debian-docker/run.sh +++ b/packaging/debian-docker/run.sh @@ -11,7 +11,7 @@ mkdir dist docker run --read-only $CONTAINER sleep 100 & sleep 1 docker container ls -ID=`docker container ls | grep $CONTAINER | head -n1 | awk '{print $1}'` +ID=$(docker container ls | grep $CONTAINER | head -n1 | awk '{print $1}') echo "Extracting files from $ID" docker cp "$ID:/build/packages.tgz" . echo "Stopping $CONTAINER ($ID)" diff --git a/packaging/debian-docker/sync-build.sh b/packaging/debian-docker/sync-build.sh index e38a0ee..2f5d9df 100644 --- a/packaging/debian-docker/sync-build.sh +++ b/packaging/debian-docker/sync-build.sh @@ -5,12 +5,12 @@ set -eu unset LD_LIBRARY_PATH +rm -rf /build/sync + mkdir -p /build/sync cd /build/sync # Fetch source -rm -rf * - for n in sync do git clone git://git.taler.net/$n diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile index 96552e9..f6e39c0 100644 --- a/packaging/ubuntu-docker/Dockerfile +++ b/packaging/ubuntu-docker/Dockerfile @@ -23,6 +23,7 @@ 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 |