From d91bdad62bde9dc71aac00f56e6d544f875bd658 Mon Sep 17 00:00:00 2001
From: Ned Bingham <edward.bingham@broccolimicro.io>
Date: Fri, 2 Jun 2023 04:15:49 +0000
Subject: [PATCH] setting up per-user bcli containers

---
 bcli-develop.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bcli-develop.sh b/bcli-develop.sh
index aee35c9..9199a03 100644
--- a/bcli-develop.sh
+++ b/bcli-develop.sh
@@ -1,11 +1,11 @@
 bcli() {
     if [ "$1" = "up" ]; then
-	docker run --rm -d -v $HOME:/host -v "/opt/tech:/opt/cad/conf" --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" public.ecr.aws/l5h5o6z4/broccoli-cli:latest > /dev/null
-	#docker run --rm -d -v $HOME:/host -v "${BCLI_TECH:/opt/tech}:/opt/cad/conf" --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" ${BCLI_IMAGE:-public.ecr.aws/l5h5o6z4/broccoli-cli:latest} > /dev/null
-	echo "bcli-develop started"
+	docker run --rm -d -v $HOME:/host -v "/opt/tech:/opt/cad/conf" --name "bcli-$USER" -h "bcli-$USER" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" public.ecr.aws/l5h5o6z4/broccoli-cli:latest > /dev/null
+	#docker run --rm -d -v $HOME:/host -v "${BCLI_TECH:/opt/tech}:/opt/cad/conf" --name "bcli-$USER" -h "bcli-$USER" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" ${BCLI_IMAGE:-public.ecr.aws/l5h5o6z4/broccoli-cli:latest} > /dev/null
+	echo "bcli-$USER started"
     elif [ "$1" = "down" ]; then
-	docker stop bcli-develop > /dev/null
-	echo "bcli-develop stopped"
+	docker stop "bcli-$USER" > /dev/null
+	echo "bcli-$USER stopped"
 	#legacy, or if server files change faster than a new download
     elif [ "$1" = "mount" ]; then
 	if [ -z "$BROCCOLI_USER" ]; then
@@ -24,7 +24,7 @@ bcli() {
 	fi
 	rmdir $HOME/tech
     elif [ "$#" -eq 0 ]; then 
-	docker exec -u $(id -u):$(id -g) -it bcli-develop /bin/bash
+	docker exec -u $(id -u):$(id -g) -it "bcli-$USER" /bin/bash
     else
 	if [ "$1" != "--help" ]; then
 	    echo "error: unrecognized command '$1'"