From 6cd72afba6f368c1445fa132c1ff770657ee0c3a Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Thu, 16 Nov 2023 16:14:03 -0800 Subject: [PATCH] test 2 --- .cirrus.yml | 3 --- docker/final.Dockerfile | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1c25ce170b5..4db904079aa 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -679,9 +679,6 @@ cluster_testing_docker_builder: $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH =~ 'release/.*' || $CIRRUS_TAG != '' ) env: CIRRUS_LOG_TIMESTAMP: true - install_deps_script: - # The cluster tests depend on jq and docker_builder doesn't have that :-( - - apt-get -q update && apt-get install -y --no-install-recommends jq sync_btest_script: git submodule update --init ./auxil/btest/ checkout_script: - set -x; cd testing/external/ && git clone https://github.com/zeek/zeek-testing-cluster.git && make checkout-repos diff --git a/docker/final.Dockerfile b/docker/final.Dockerfile index eeafb1de09a..61c732a2ee3 100644 --- a/docker/final.Dockerfile +++ b/docker/final.Dockerfile @@ -18,6 +18,7 @@ RUN apt-get -q update \ && apt-get install -q -y --no-install-recommends \ ca-certificates \ git \ + jq \ libmaxminddb0 \ libnode108 \ libpython3.11 \