From 4351611859b244af6f7efc69c8cfd196ead5d669 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Sun, 17 Oct 2021 16:37:51 -0300 Subject: [PATCH] Add automake, libtool, libjemalloc-dev --- contrib/ci/docker/10-debian-bullseye.dockerfile | 3 +++ contrib/ci/docker/10-debian-buster.dockerfile | 3 +++ contrib/ci/docker/10-debian-sid.dockerfile | 3 +++ contrib/ci/docker/10-debian-stable.dockerfile | 3 +++ contrib/ci/docker/10-ubuntu-bionic.dockerfile | 1 + contrib/ci/docker/10-ubuntu-focal.dockerfile | 3 +++ contrib/ci/docker/10-ubuntu-impish.dockerfile | 3 +++ contrib/ci/docker/10-ubuntu-lts.dockerfile | 3 +++ contrib/ci/docker/10-ubuntu-rolling.dockerfile | 3 +++ 9 files changed, 25 insertions(+) diff --git a/contrib/ci/docker/10-debian-bullseye.dockerfile b/contrib/ci/docker/10-debian-bullseye.dockerfile index c061cac9e..d92ea1b97 100644 --- a/contrib/ci/docker/10-debian-bullseye.dockerfile +++ b/contrib/ci/docker/10-debian-bullseye.dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-bullseye-base/${ARCH} RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -14,12 +15,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-debian-buster.dockerfile b/contrib/ci/docker/10-debian-buster.dockerfile index b9cd4e6f6..7349189f7 100644 --- a/contrib/ci/docker/10-debian-buster.dockerfile +++ b/contrib/ci/docker/10-debian-buster.dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-buster-base/${ARCH} RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -14,12 +15,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-debian-sid.dockerfile b/contrib/ci/docker/10-debian-sid.dockerfile index 32ac1d46f..7bb2f8c3c 100644 --- a/contrib/ci/docker/10-debian-sid.dockerfile +++ b/contrib/ci/docker/10-debian-sid.dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-sid-base/${ARCH} RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -14,12 +15,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-debian-stable.dockerfile b/contrib/ci/docker/10-debian-stable.dockerfile index 585de0a17..cd50a4651 100644 --- a/contrib/ci/docker/10-debian-stable.dockerfile +++ b/contrib/ci/docker/10-debian-stable.dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-stable-base/${ARCH} RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -14,12 +15,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-ubuntu-bionic.dockerfile b/contrib/ci/docker/10-ubuntu-bionic.dockerfile index 9097406e9..767d2f3d1 100644 --- a/contrib/ci/docker/10-ubuntu-bionic.dockerfile +++ b/contrib/ci/docker/10-ubuntu-bionic.dockerfile @@ -14,6 +14,7 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ gdb \ git \ gperf \ + libjemalloc-dev \ libpgm-dev \ libtool \ libuv1-dev \ diff --git a/contrib/ci/docker/10-ubuntu-focal.dockerfile b/contrib/ci/docker/10-ubuntu-focal.dockerfile index aee953456..a9d38599e 100644 --- a/contrib/ci/docker/10-ubuntu-focal.dockerfile +++ b/contrib/ci/docker/10-ubuntu-focal.dockerfile @@ -4,6 +4,7 @@ RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-s RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \ && apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -17,12 +18,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-ubuntu-impish.dockerfile b/contrib/ci/docker/10-ubuntu-impish.dockerfile index 472d12f50..0e7c354e0 100644 --- a/contrib/ci/docker/10-ubuntu-impish.dockerfile +++ b/contrib/ci/docker/10-ubuntu-impish.dockerfile @@ -4,6 +4,7 @@ RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-s RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \ && apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -17,12 +18,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-ubuntu-lts.dockerfile b/contrib/ci/docker/10-ubuntu-lts.dockerfile index f2763cfa1..3b2dfc413 100644 --- a/contrib/ci/docker/10-ubuntu-lts.dockerfile +++ b/contrib/ci/docker/10-ubuntu-lts.dockerfile @@ -4,6 +4,7 @@ RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-s RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \ && apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -17,12 +18,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \ diff --git a/contrib/ci/docker/10-ubuntu-rolling.dockerfile b/contrib/ci/docker/10-ubuntu-rolling.dockerfile index de4401479..989dc0a5c 100644 --- a/contrib/ci/docker/10-ubuntu-rolling.dockerfile +++ b/contrib/ci/docker/10-ubuntu-rolling.dockerfile @@ -4,6 +4,7 @@ RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-s RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ && apt-get -o=Dpkg::Use-Pty=0 -q dist-upgrade -y \ && apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ + automake \ ccache \ cmake \ eatmydata \ @@ -17,12 +18,14 @@ RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ libevent-dev \ libgtest-dev \ libhidapi-dev \ + libjemalloc-dev \ libminiupnpc-dev \ libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ libsystemd-dev \ + libtool \ libunbound-dev \ libunwind8-dev \ libusb-1.0.0-dev \