Skip to content

Commit

Permalink
Use k8s-test-infra devel image
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>
  • Loading branch information
ArangoGutierrez committed Apr 4, 2024
1 parent c16a028 commit 5bcd16a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 32 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ TARGETS := $(MAKE_TARGETS) $(CMD_TARGETS)

DOCKER_TARGETS := $(patsubst %,docker-%, $(TARGETS))
.PHONY: $(TARGETS) $(DOCKER_TARGETS)
DOCKERFILE_DEVEL := $(CURDIR)/deployments/container/Dockerfile.devel
DOCKERFILE_DEVEL := "images/devel/Dockerfile"
K8S_TEST_INFRA := "https://github.com/NVIDIA/k8s-test-infra.git"

GOOS ?= linux
ifeq ($(VERSION),)
Expand Down Expand Up @@ -140,7 +141,7 @@ generate-clientset: .remove-clientset .remove-deepcopy .remove-crds
.remove-clientset:
rm -rf $(CURDIR)/$(PKG_BASE)/clientset

build-image: $(DOCKERFILE_DEVEL)
build-image:
$(DOCKER) build \
--progress=plain \
--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
Expand All @@ -150,7 +151,7 @@ build-image: $(DOCKERFILE_DEVEL)
--build-arg MOQ_VERSION="$(MOQ_VERSION)" \
--tag $(BUILDIMAGE) \
-f $(DOCKERFILE_DEVEL) \
.
$(K8S_TEST_INFRA)

$(DOCKER_TARGETS): docker-%:
@echo "Running 'make $(*)' in container image $(BUILDIMAGE)"
Expand Down
29 changes: 0 additions & 29 deletions deployments/container/Dockerfile.devel

This file was deleted.

0 comments on commit 5bcd16a

Please sign in to comment.