From 4c45d54be733ba5bfa07b7dd1e864c00a3c40f9d Mon Sep 17 00:00:00 2001 From: sbyrnes1 Date: Thu, 14 Mar 2024 23:18:12 +0000 Subject: [PATCH] fix: various --- internal-lab-setup-assets/Makefile | 3 +-- internal-lab-setup-assets/workshop-init.sh | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal-lab-setup-assets/Makefile b/internal-lab-setup-assets/Makefile index 1c8de0e..3b308c8 100644 --- a/internal-lab-setup-assets/Makefile +++ b/internal-lab-setup-assets/Makefile @@ -8,6 +8,7 @@ clab-install: dnf update dnf install docker-ce docker-ce-cli containerd.io -y dnf install containerlab -y --nogpgcheck + containerlab version upgrade gen: clean python gen-topo.py @@ -15,13 +16,11 @@ gen: clean deploy: gen for name in workshop[0-9]*.clab.yml; do\ containerlab deploy --reconfigure -t $${name};\ - # sleep 20;\ done destroy: for name in workshop[0-9]*.clab.yml; do\ containerlab destroy --cleanup -t $${name};\ - # sleep 10;\ done rm -rf $(wildcard clab-automation-workshop-[0-9]*) diff --git a/internal-lab-setup-assets/workshop-init.sh b/internal-lab-setup-assets/workshop-init.sh index 7fa9c37..9c7395a 100755 --- a/internal-lab-setup-assets/workshop-init.sh +++ b/internal-lab-setup-assets/workshop-init.sh @@ -5,10 +5,6 @@ # to avoid one user from accidentally signing into another's container. echo "clab:$LONI_LAB_PASSWORD" | chpasswd -# Give users root of their own unix containers because we're nice -echo "clab ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/clab -chmod 0440 /etc/sudoers.d/clab - # Enable highlighting in vim echo "syntax on" > /home/clab/.vimrc