From 8130070f62a670fb43e33c2d716bf6199539ee92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lipovsk=C3=BD?= Date: Tue, 24 Sep 2024 15:01:09 +0200 Subject: [PATCH] Fixing generate dockerfile Propagate FBC configs directory to Dockerfile template so it is copied correctly. [CLOUDDST-23891] --- iib/workers/tasks/opm_operations.py | 2 +- tests/test_workers/test_tasks/test_opm_operations.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iib/workers/tasks/opm_operations.py b/iib/workers/tasks/opm_operations.py index 76a63606..c7eb999c 100644 --- a/iib/workers/tasks/opm_operations.py +++ b/iib/workers/tasks/opm_operations.py @@ -683,7 +683,7 @@ def create_dockerfile( CMD ["serve", "/configs", "--cache-dir=/tmp/cache"] # Copy declarative config root and cache into image - ADD catalog /configs + ADD {os.path.basename(fbc_dir)} /configs COPY --chown=1001:0 cache /tmp/cache # Set DC-specific label for the location of the DC root directory diff --git a/tests/test_workers/test_tasks/test_opm_operations.py b/tests/test_workers/test_tasks/test_opm_operations.py index e35dcbe8..9192cfc0 100644 --- a/tests/test_workers/test_tasks/test_opm_operations.py +++ b/tests/test_workers/test_tasks/test_opm_operations.py @@ -438,7 +438,7 @@ def test_create_dockerfile(tmpdir, dockerfile): CMD ["serve", "/configs", "--cache-dir=/tmp/cache"] # Copy declarative config root and cache into image - ADD catalog /configs + ADD catalogs /configs COPY --chown=1001:0 cache /tmp/cache # Set DC-specific label for the location of the DC root directory