Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use k8s-test-infra devel image #86

Merged
merged 2 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"
DOCKERFILE_CONTEXT ?= "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) \
.
$(DOCKERFILE_CONTEXT)

$(DOCKER_TARGETS): docker-%:
@echo "Running 'make $(*)' in container image $(BUILDIMAGE)"
Expand Down
2 changes: 1 addition & 1 deletion demo/clusters/kind/scripts/build-driver-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ cd ${PROJECT_DIR}

# Regenerate the CRDs and build the container image
# TODO: This should be part of the image name
make docker-generate
make build-image
make docker-generate
make -f deployments/container/Makefile build

cd ${CURRENT_DIR}
29 changes: 0 additions & 29 deletions deployments/container/Dockerfile.devel

This file was deleted.