diff --git a/ComposeFiles/homeTwo.yml b/ComposeFiles/homeTwo.yml new file mode 100644 index 0000000..ef2a43f --- /dev/null +++ b/ComposeFiles/homeTwo.yml @@ -0,0 +1,29 @@ +version: '3.8' + +services: +# NOTE:Second Deployment of Home + filebrowser: # Temporary File Server # Tmp File Server + image: hurlenko/filebrowser + user: "1000:1000" + ports: + - "30513:8080" + volumes: + - /home/user/docker-main/513_TmpFileServer/Conf:/config + - /home/user/docker-main/513_TmpFileServer/Data:/data + environment: + - FB_BASEURL=/filebrowser + deploy: + replicas: 1 + placement: + constraints: [ node.role == worker ] + + + + + + + +networks: +# host: +# external: true + net: diff --git a/Scripts/mapping_viewer.sh b/Scripts/mapping_viewer.sh index 3f3f6df..71b5412 100644 --- a/Scripts/mapping_viewer.sh +++ b/Scripts/mapping_viewer.sh @@ -27,10 +27,10 @@ LEVEL_TWO=" " echo "/* BEGIN DOCKER SWARM MAPPING */ subgraph Cluster_Services { bgcolor="white" - label="Services" + label="Docker" subgraph Cluster_Services_Swarm { - label=\"Docker Swarm\"" + label=\"Swarm: Deployments\"" for i in $(ls -1 ComposeFiles/); do if [[ "$i" != "template.yml" ]]; then if [[ "$i" != "tset.yml" ]]; then @@ -48,6 +48,7 @@ for i in $(ls -1 ComposeFiles/); do echo "" NAMES=$(cat "ComposeFiles/$i" | grep -Ev '( .*|version:|services:|net*)' | sed 's/^#.*//g' | sort | uniq | tr ' ' '_') + NumNum=0 for xena in $(echo "$NAMES" | tr ',' ' '); do nameName=$(echo $xena | cut -d':' -f1 | tr -s '_') cutName=$(echo $nameName | cut -c 1-4) @@ -60,10 +61,15 @@ for i in $(ls -1 ComposeFiles/); do else aArray="$aArray -> $locPRE$locPOST$cutName" fi + NumNum=$((NumNum+1)) done echo "" - echo "$LEVEL_TWO $aArray [style=invis];" + if [[ $NumNum == "1" ]]; then + echo "$LEVEL_TWO $aArray;" + else + echo "$LEVEL_TWO $aArray [style=invis];" + fi echo "$LEVEL_ONE }" echo -e "\n"