Skip to content

Commit a428ced

Browse files
authored
Merge pull request #774 from yuumasato/fix-openscap-image-build
make deploy-local: Fix build of openscap image
2 parents 2e17e5d + bf32a99 commit a428ced

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ TAG?=$(DEFAULT_TAG)
6868
OPENSCAP_NAME=openscap-ocp
6969
DEFAULT_OPENSCAP_TAG=latest
7070
OPENSCAP_TAG?=$(DEFAULT_OPENSCAP_TAG)
71-
OPENSCAP_DOCKER_CONTEXT=./images/openscap
71+
OPENSCAP_DOCKER_FILE=./images/openscap/Containerfile
7272
DEFAULT_OPENSCAP_IMAGE=$(DEFAULT_REPO)/$(OPENSCAP_NAME):$(DEFAULT_OPENSCAP_TAG)
7373
OPENSCAP_IMAGE?=$(DEFAULT_OPENSCAP_IMAGE)
7474

@@ -460,7 +460,7 @@ bundle-image: bundle ## Build the bundle image.
460460

461461
.PHONY: openscap-image
462462
openscap-image:
463-
$(RUNTIME) $(RUNTIME_BUILD_CMD) $(RUNTIME_BUILD_OPTS) --no-cache -t $(OPENSCAP_IMAGE) $(OPENSCAP_DOCKER_CONTEXT)
463+
$(RUNTIME) $(RUNTIME_BUILD_CMD) $(RUNTIME_BUILD_OPTS) --no-cache -t $(OPENSCAP_IMAGE) -f $(OPENSCAP_DOCKER_FILE) .
464464

465465
# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
466466
# This recipe invokes 'opm render' to build a file-based catalog.

0 commit comments

Comments
 (0)