Skip to content

Commit 8130070

Browse files
committed
Fixing generate dockerfile
Propagate FBC configs directory to Dockerfile template so it is copied correctly. [CLOUDDST-23891]
1 parent 491c522 commit 8130070

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

iib/workers/tasks/opm_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ def create_dockerfile(
683683
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
684684
685685
# Copy declarative config root and cache into image
686-
ADD catalog /configs
686+
ADD {os.path.basename(fbc_dir)} /configs
687687
COPY --chown=1001:0 cache /tmp/cache
688688
689689
# Set DC-specific label for the location of the DC root directory

tests/test_workers/test_tasks/test_opm_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ def test_create_dockerfile(tmpdir, dockerfile):
438438
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
439439
440440
# Copy declarative config root and cache into image
441-
ADD catalog /configs
441+
ADD catalogs /configs
442442
COPY --chown=1001:0 cache /tmp/cache
443443
444444
# Set DC-specific label for the location of the DC root directory

0 commit comments

Comments
 (0)