From 9ee2408239020fb5173a28a146ac41788551ec3c Mon Sep 17 00:00:00 2001 From: Malte Bauch <malte.bauch@stud.h-da.de> Date: Thu, 2 Feb 2023 14:30:35 +0000 Subject: [PATCH] Change directory for clab created files to `/tmp/clab` See merge request danet/gosdn!420 --- Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1c3ead6f2..8aa1cd045 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) MAKEFILE_DIR := $(dir $(MAKEFILE_PATH)) TOOLS_DIR:= build-tools +GOSDN_TMP_DIR := /tmp/gosdn +CLAB_DIR := $(GOSDN_TMP_DIR)/clab GOSDN_PRG := $(MAKEFILE_DIR)$(TOOLS_DIR) GOPATH := $(~/go) GOBIN := $(GOSDN_PRG) @@ -16,6 +18,12 @@ all: build pre: mkdir -p $(BUILD_ARTIFACTS_PATH) +create-gosdn-tmp-dir: + mkdir -p $(GOSDN_TMP_DIR) + +create-clab-dir: create-gosdn-tmp-dir + mkdir -p $(CLAB_DIR) + install-tools: @echo Install development tooling mkdir -p $(GOSDN_PRG) @@ -102,14 +110,17 @@ containerize-arista-routing-engine-app: containerize-hostname-checker-app: docker buildx build --rm -t hostname-checker-app -f applications/hostname-checker/hostname-checker.Dockerfile . -containerlab-start: containerize-all - sudo containerlab deploy --topo dev_env_data/clab/gosdn.clab.yaml +containerlab-start: create-clab-dir containerize-all + cd $(CLAB_DIR) &&\ + sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml -containerlab-stop: - sudo containerlab destroy --topo dev_env_data/clab/gosdn.clab.yaml +containerlab-stop: create-clab-dir + cd $(CLAB_DIR) &&\ + sudo containerlab destroy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml -containerlab-graph: - sudo containerlab graph --topo dev_env_data/clab/gosdn.clab.yaml +containerlab-graph: create-clab-dir + cd $(CLAB_DIR) &&\ + sudo containerlab graph --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml shell-gosdn: docker exec -it clab-gosdn_csbi_arista_base-gosdn bash -- GitLab