Update Makefile #289
Open
Update Makefile #289
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In the last line is calling the variable $(VR_NAME) but it wasn't defined before so i update the variable NAME to VR_NAME
hellt
reviewed
Dec 3, 2024
Comment on lines
-28
to
-35
| # mostly copied from makefile.include, i wish this was easier to change | ||
| docker-build-common: docker-clean-build docker-pre-build | ||
| @if [ -z "$$IMAGE" ]; then echo "ERROR: No IMAGE specified"; exit 1; fi | ||
| @if [ "$(IMAGE)" = "$(VERSION)" ]; then echo "ERROR: Incorrect version string ($(IMAGE)). The regexp for extracting version information is likely incorrect, check the regexp in the Makefile or open an issue at https://github.com/hellt/vrnetlab/issues/new including the image file name you are using."; exit 1; fi | ||
| @echo "Building docker image using $(IMAGE) as $(REGISTRY)vr-$(VR_NAME):$(VERSION)" | ||
| cp ../common/* docker/ | ||
| $(MAKE) IMAGE=$$IMAGE docker-build-image-copy | ||
| (cd docker; docker build --build-arg http_proxy=$(http_proxy) --build-arg https_proxy=$(https_proxy) --build-arg RE_IMAGE=$(IMAGE) --build-arg PFE_IMAGE=$(PFE_IMAGE) -t $(REGISTRY)vr-$(VR_NAME):$(VERSION) .) |
There was a problem hiding this comment.
Hi @Zegroj
I had a look at the makefile and I wonder if it is time to change it to the common workflow. I pushed over the change, if you do a pull and rerun make I wonder if you will build a bootable system. Thnx
There was a problem hiding this comment.
Hi @hellt i re run it with the change you made but didnt allow me to build a bootable system in the vqfx, i tried again with the old version but with this change "the variable NAME to VR_NAME" and worked fine
There was a problem hiding this comment.
ah, I see, I think the PFE image was missing when I removed this overriding build step. I will have a look
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the last line is calling the variable $(VR_NAME) but it wasn't defined before so i update the variable NAME to VR_NAME