Skip to content

Commit c1f8866

Browse files
committed
try vqfx with the common workflow
1 parent 8c2411d commit c1f8866

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

vqfx/Makefile

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VENDOR=Juniper
2-
VR_NAME=vQFX
2+
NAME=vQFX
33
IMAGE_FORMAT=qcow2
44
IMAGE_GLOB=*.qcow2
55

@@ -19,17 +19,8 @@ format-legacy-images:
1919

2020
# TODO: we should make sure we only copy one PFE image (the latest?), in case there are many
2121
docker-pre-build:
22-
2322
echo "pfe $(PFE_IMAGE)"
2423
cp vqfx*-pfe*.qcow* docker/
2524
echo "image $(IMAGE)"
2625
echo "version $(VERSION)"
2726

28-
# mostly copied from makefile.include, i wish this was easier to change
29-
docker-build-common: docker-clean-build docker-pre-build
30-
@if [ -z "$$IMAGE" ]; then echo "ERROR: No IMAGE specified"; exit 1; fi
31-
@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
32-
@echo "Building docker image using $(IMAGE) as $(REGISTRY)vr-$(VR_NAME):$(VERSION)"
33-
cp ../common/* docker/
34-
$(MAKE) IMAGE=$$IMAGE docker-build-image-copy
35-
(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) .)

0 commit comments

Comments
 (0)