From 9bb6b41f001114f85a58944be1bb6760961f804b Mon Sep 17 00:00:00 2001 From: mickael e Date: Tue, 28 Apr 2020 10:04:02 -0400 Subject: [PATCH 1/2] Always update cache when downloading python3-requests Builder Dockerfile will delete /var/lib/apt/lists, resulting in the error `E: Unable to locate package python3-requests`, because the image was built less than 1h ago. In most or all cases, the cache will be updated regardless. (cherry picked from commit dd73b11697e85a604392561ece3202ea5f5d483f) --- .../ansible-base/roles/build-ossec-deb-pkg/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/install_files/ansible-base/roles/build-ossec-deb-pkg/tasks/main.yml b/install_files/ansible-base/roles/build-ossec-deb-pkg/tasks/main.yml index 41c9dcb035..77df056adc 100644 --- a/install_files/ansible-base/roles/build-ossec-deb-pkg/tasks/main.yml +++ b/install_files/ansible-base/roles/build-ossec-deb-pkg/tasks/main.yml @@ -15,7 +15,6 @@ name: python3-requests state: present update_cache: yes - cache_valid_time: 3600 - name: Copy over current directory for repo build synchronize: From e02de03ce6b91aa67a35f3d3471ab2555336a70c Mon Sep 17 00:00:00 2001 From: mickael e Date: Tue, 28 Apr 2020 10:03:34 -0400 Subject: [PATCH 2/2] Update builder image Builder image needed updates (cherry picked from commit 6a2525f05fbaf8a6cc199a026e44e3b2e95c58cb) --- molecule/builder-xenial/image_hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/builder-xenial/image_hash b/molecule/builder-xenial/image_hash index 7391c0dffe..dc36f10cb4 100644 --- a/molecule/builder-xenial/image_hash +++ b/molecule/builder-xenial/image_hash @@ -1,2 +1,2 @@ -# sha256 digest quay.io/freedomofpress/sd-docker-builder-xenial:2020_03_13 -4aa995f81652461e8bbd1e937440c103476f872f018df8b3ba5c62b8f315b3e7 +# sha256 digest quay.io/freedomofpress/sd-docker-builder-xenial:2020_04_28 +71f4c1c23d72de33936f575d2dba4b5102895d3d520a4de5d69ca58528142790