diff --git a/contrib/ci/docker/00-debian-bullseye-base.dockerfile b/contrib/ci/docker/00-debian-bullseye-base.dockerfile index 120c55c40..4d691d074 100644 --- a/contrib/ci/docker/00-debian-bullseye-base.dockerfile +++ b/contrib/ci/docker/00-debian-bullseye-base.dockerfile @@ -1,4 +1,6 @@ ARG ARCH=amd64 FROM ${ARCH}/debian:bullseye RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q autoremove -y' +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 -q autoremove -y diff --git a/contrib/ci/docker/00-debian-buster-base.dockerfile b/contrib/ci/docker/00-debian-buster-base.dockerfile index 3a36cda42..43c6ca4be 100644 --- a/contrib/ci/docker/00-debian-buster-base.dockerfile +++ b/contrib/ci/docker/00-debian-buster-base.dockerfile @@ -1,4 +1,6 @@ ARG ARCH=amd64 FROM ${ARCH}/debian:buster RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q autoremove -y' +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 -q autoremove -y diff --git a/contrib/ci/docker/00-debian-sid-base.dockerfile b/contrib/ci/docker/00-debian-sid-base.dockerfile index 0ae5432ff..9293b6e9e 100644 --- a/contrib/ci/docker/00-debian-sid-base.dockerfile +++ b/contrib/ci/docker/00-debian-sid-base.dockerfile @@ -1,4 +1,6 @@ ARG ARCH=amd64 FROM ${ARCH}/debian:sid RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q autoremove -y' +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 -q autoremove -y diff --git a/contrib/ci/docker/00-debian-stable-base.dockerfile b/contrib/ci/docker/00-debian-stable-base.dockerfile index 1313788ce..62eedbd67 100644 --- a/contrib/ci/docker/00-debian-stable-base.dockerfile +++ b/contrib/ci/docker/00-debian-stable-base.dockerfile @@ -1,4 +1,6 @@ ARG ARCH=amd64 FROM ${ARCH}/debian:stable RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q autoremove -y' +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 -q autoremove -y diff --git a/contrib/ci/docker/00-debian-testing-base.dockerfile b/contrib/ci/docker/00-debian-testing-base.dockerfile index 047ee08c7..714e24542 100644 --- a/contrib/ci/docker/00-debian-testing-base.dockerfile +++ b/contrib/ci/docker/00-debian-testing-base.dockerfile @@ -1,4 +1,6 @@ ARG ARCH=amd64 FROM ${ARCH}/debian:testing RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q autoremove -y' +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 -q autoremove -y diff --git a/contrib/ci/docker/10-debian-bullseye.dockerfile b/contrib/ci/docker/10-debian-bullseye.dockerfile index f1d93de55..c061cac9e 100644 --- a/contrib/ci/docker/10-debian-bullseye.dockerfile +++ b/contrib/ci/docker/10-debian-bullseye.dockerfile @@ -1,3 +1,36 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-bullseye-base/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-debian-buster.dockerfile b/contrib/ci/docker/10-debian-buster.dockerfile index 21c3fa60b..b9cd4e6f6 100644 --- a/contrib/ci/docker/10-debian-buster.dockerfile +++ b/contrib/ci/docker/10-debian-buster.dockerfile @@ -1,3 +1,36 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-buster-base/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-debian-sid.dockerfile b/contrib/ci/docker/10-debian-sid.dockerfile index 3de3dd88d..32ac1d46f 100644 --- a/contrib/ci/docker/10-debian-sid.dockerfile +++ b/contrib/ci/docker/10-debian-sid.dockerfile @@ -1,3 +1,36 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-sid-base/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +RUN apt-get -o=Dpkg::Use-Pty=0 --no-install-recommends -q install -y \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-debian-stable.dockerfile b/contrib/ci/docker/10-debian-stable.dockerfile index 0e2d3bf2c..585de0a17 100644 --- a/contrib/ci/docker/10-debian-stable.dockerfile +++ b/contrib/ci/docker/10-debian-stable.dockerfile @@ -1,3 +1,36 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-stable-base/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-ubuntu-bionic.dockerfile b/contrib/ci/docker/10-ubuntu-bionic.dockerfile index 61a7eaff4..9097406e9 100644 --- a/contrib/ci/docker/10-ubuntu-bionic.dockerfile +++ b/contrib/ci/docker/10-ubuntu-bionic.dockerfile @@ -1,4 +1,30 @@ ARG ARCH=amd64 FROM ${ARCH}/ubuntu:bionic RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q --no-install-recommends install -y eatmydata gdb cmake git ninja-build pkg-config ccache g++-8 python3-dev automake libtool autoconf make qttools5-dev file gperf patch openssh-client lsb-release libzmq3-dev libpgm-dev libuv1-dev openssh-client && mkdir -p /usr/lib/x86_64-linux-gnu/pgm-5.2/include' +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 -q --no-install-recommends install -y \ + autoconf \ + automake \ + ccache \ + cmake \ + eatmydata \ + file \ + g++-8 \ + gdb \ + git \ + gperf \ + libpgm-dev \ + libtool \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + ninja-build \ + openssh-client \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev \ + && mkdir -p /usr/lib/x86_64-linux-gnu/pgm-5.2/include diff --git a/contrib/ci/docker/10-ubuntu-focal.dockerfile b/contrib/ci/docker/10-ubuntu-focal.dockerfile index 20c2bd0d5..aee953456 100644 --- a/contrib/ci/docker/10-ubuntu-focal.dockerfile +++ b/contrib/ci/docker/10-ubuntu-focal.dockerfile @@ -1,4 +1,39 @@ ARG ARCH=amd64 FROM ${ARCH}/ubuntu:focal RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +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 \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-ubuntu-impish.dockerfile b/contrib/ci/docker/10-ubuntu-impish.dockerfile index e4bbc81cb..472d12f50 100644 --- a/contrib/ci/docker/10-ubuntu-impish.dockerfile +++ b/contrib/ci/docker/10-ubuntu-impish.dockerfile @@ -1,4 +1,39 @@ ARG ARCH=amd64 FROM ${ARCH}/ubuntu:impish RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +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 \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-ubuntu-lts.dockerfile b/contrib/ci/docker/10-ubuntu-lts.dockerfile index 69b52a8cc..f2763cfa1 100644 --- a/contrib/ci/docker/10-ubuntu-lts.dockerfile +++ b/contrib/ci/docker/10-ubuntu-lts.dockerfile @@ -1,4 +1,39 @@ ARG ARCH=amd64 FROM ${ARCH}/ubuntu:latest RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +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 \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/10-ubuntu-rolling.dockerfile b/contrib/ci/docker/10-ubuntu-rolling.dockerfile index 7fefffc5e..de4401479 100644 --- a/contrib/ci/docker/10-ubuntu-rolling.dockerfile +++ b/contrib/ci/docker/10-ubuntu-rolling.dockerfile @@ -1,4 +1,39 @@ ARG ARCH=amd64 FROM ${ARCH}/ubuntu:rolling RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ libsodium-dev libzmq3-dev libsystemd-dev python3-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev libboost-thread-dev libboost-serialization-dev libboost-program-options-dev libgtest-dev libminiupnpc-dev libunwind8-dev libreadline-dev libhidapi-dev libusb-1.0.0-dev qttools5-dev libcurl4-openssl-dev lsb-release openssh-client' +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 \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + libboost-program-options-dev \ + libboost-serialization-dev \ + libboost-thread-dev \ + libcurl4-openssl-dev \ + libevent-dev \ + libgtest-dev \ + libhidapi-dev \ + libminiupnpc-dev \ + libreadline-dev \ + libsodium-dev \ + libsqlite3-dev \ + libssl-dev \ + libsystemd-dev \ + libunbound-dev \ + libunwind8-dev \ + libusb-1.0.0-dev \ + libuv1-dev \ + libzmq3-dev \ + lsb-release \ + make \ + nettle-dev \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + python3-dev \ + qttools5-dev diff --git a/contrib/ci/docker/50-android.dockerfile b/contrib/ci/docker/50-android.dockerfile index c6650a5f4..04163fc63 100644 --- a/contrib/ci/docker/50-android.dockerfile +++ b/contrib/ci/docker/50-android.dockerfile @@ -1,4 +1,23 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-testing-base/${ARCH} RUN /bin/bash -c 'sed -i "s/main/main contrib/g" /etc/apt/sources.list' -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q update && apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y android-sdk google-android-ndk-installer wget git pkg-config automake libtool cmake make patch ccache curl zip xz-utils openssh-client && git clone https://github.com/Shadowstyler/android-sdk-licenses.git /tmp/android-sdk-licenses && cp -a /tmp/android-sdk-licenses/*-license /usr/lib/android-sdk/licenses && rm -rf /tmp/android-sdk-licenses' +RUN apt-get -o=Dpkg::Use-Pty=0 -q update \ + && apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + android-sdk \ + automake \ + ccache \ + cmake \ + curl \ + git \ + google-android-ndk-installer \ + libtool \ + make \ + openssh-client \ + patch \ + pkg-config \ + wget \ + xz-utils \ + zip \ + && git clone https://github.com/Shadowstyler/android-sdk-licenses.git /tmp/android-sdk-licenses \ + && cp -a /tmp/android-sdk-licenses/*-license /usr/lib/android-sdk/licenses \ + && rm -rf /tmp/android-sdk-licenses diff --git a/contrib/ci/docker/debian-sid-clang.dockerfile b/contrib/ci/docker/debian-sid-clang.dockerfile index 7dc8e5cc1..6d21df7fe 100644 --- a/contrib/ci/docker/debian-sid-clang.dockerfile +++ b/contrib/ci/docker/debian-sid-clang.dockerfile @@ -1,3 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-sid/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y clang-13 lld-13 libc++-13-dev libc++abi-13-dev' +RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + clang-13 \ + libc++-13-dev \ + libc++abi-13-dev \ + lld-13 diff --git a/contrib/ci/docker/debian-win32-cross.dockerfile b/contrib/ci/docker/debian-win32-cross.dockerfile index b5eedbbad..f2d852644 100644 --- a/contrib/ci/docker/debian-win32-cross.dockerfile +++ b/contrib/ci/docker/debian-win32-cross.dockerfile @@ -1,4 +1,24 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-testing-base/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y eatmydata build-essential cmake git ninja-build pkg-config ccache g++-mingw-w64-x86-64-posix nsis zip automake libtool autoconf make qttools5-dev file gperf patch openssh-client' -RUN /bin/bash -c 'update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix && update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix' +RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + autoconf \ + automake \ + build-essential \ + ccache \ + cmake \ + eatmydata \ + file \ + g++-mingw-w64-x86-64-posix \ + git \ + gperf \ + libtool \ + make \ + ninja-build \ + nsis \ + openssh-client \ + patch \ + pkg-config \ + qttools5-dev \ + zip \ + && update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix \ + && update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix diff --git a/contrib/ci/docker/flutter.dockerfile b/contrib/ci/docker/flutter.dockerfile index bf549edd1..17b39a980 100644 --- a/contrib/ci/docker/flutter.dockerfile +++ b/contrib/ci/docker/flutter.dockerfile @@ -1,3 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-android/${ARCH} -RUN /bin/bash -c 'cd /opt && curl https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_2.2.2-stable.tar.xz | tar xJv && ln -s /opt/flutter/bin/flutter /usr/local/bin/ && flutter precache' +RUN cd /opt \ + && curl https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_2.2.2-stable.tar.xz \ + | tar xJv \ + && ln -s /opt/flutter/bin/flutter /usr/local/bin/ \ + && flutter precache diff --git a/contrib/ci/docker/lint.dockerfile b/contrib/ci/docker/lint.dockerfile index 62f97940a..d9636827d 100644 --- a/contrib/ci/docker/lint.dockerfile +++ b/contrib/ci/docker/lint.dockerfile @@ -1,3 +1,7 @@ ARG ARCH=amd64 FROM registry.oxen.rocks/lokinet-ci-debian-sid-base/${ARCH} -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y eatmydata git clang-format-11 jsonnet' +RUN apt-get -o=Dpkg::Use-Pty=0 -q install --no-install-recommends -y \ + clang-format-11 \ + eatmydata \ + git \ + jsonnet diff --git a/contrib/ci/docker/nodejs.dockerfile b/contrib/ci/docker/nodejs.dockerfile index 48264e3ce..625251173 100644 --- a/contrib/ci/docker/nodejs.dockerfile +++ b/contrib/ci/docker/nodejs.dockerfile @@ -1,3 +1,17 @@ FROM node:14.16.1 RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c '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 -q install --no-install-recommends -y eatmydata gdb cmake make patch git ninja-build pkg-config ccache g++ wine openssh-client' +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 -q install --no-install-recommends -y \ + ccache \ + cmake \ + eatmydata \ + g++ \ + gdb \ + git \ + make \ + ninja-build \ + openssh-client \ + patch \ + pkg-config \ + wine