From ef5b39c4f1daf8fb7c6a3ac957b90b3d96a7f4d1 Mon Sep 17 00:00:00 2001 From: msramalho <19508417+msramalho@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:05:56 +0000 Subject: [PATCH] dind exception --- src/auto_archiver/enrichers/wacz_enricher.py | 9 +++++++-- src/auto_archiver/version.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/auto_archiver/enrichers/wacz_enricher.py b/src/auto_archiver/enrichers/wacz_enricher.py index 15c5167..5af17c2 100644 --- a/src/auto_archiver/enrichers/wacz_enricher.py +++ b/src/auto_archiver/enrichers/wacz_enricher.py @@ -120,7 +120,10 @@ class WaczArchiverEnricher(Enricher, Archiver): logger.error(f"WACZ generation failed: {e}") return False - if self.use_docker: + + if self.docker_in_docker: + wacz_fn = os.path.join(self.cwd_dind, "collections", collection, f"{collection}.wacz") + elif self.use_docker: wacz_fn = os.path.join(browsertrix_home_container, "collections", collection, f"{collection}.wacz") else: wacz_fn = os.path.join("collections", collection, f"{collection}.wacz") @@ -133,7 +136,9 @@ class WaczArchiverEnricher(Enricher, Archiver): if self.extract_media or self.extract_screenshot: self.extract_media_from_wacz(to_enrich, wacz_fn) - if self.use_docker: + if self.docker_in_docker: + jsonl_fn = os.path.join(self.cwd_dind, "collections", collection, "pages", "pages.jsonl") + elif self.use_docker: jsonl_fn = os.path.join(browsertrix_home_container, "collections", collection, "pages", "pages.jsonl") else: jsonl_fn = os.path.join("collections", collection, "pages", "pages.jsonl") diff --git a/src/auto_archiver/version.py b/src/auto_archiver/version.py index 47b18da..09b2e02 100644 --- a/src/auto_archiver/version.py +++ b/src/auto_archiver/version.py @@ -3,7 +3,7 @@ _MAJOR = "0" _MINOR = "9" # On main and in a nightly release the patch should be one ahead of the last # released build. -_PATCH = "6" +_PATCH = "7" # This is mainly for nightly builds which have the suffix ".dev$DATE". See # https://semver.org/#is-v123-a-semantic-version for the semantics. _SUFFIX = ""