Merge pull request #171 from jbernal0019/master

Change service name from 'pman_service' to 'pman'
FNNDSC · Apr 26, 2021 · 35eb25b · 35eb25b
2 parents f67f81d + 33eed78
commit 35eb25b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
           docker build --build-arg ENVIRONMENT=local -t fnndsc/pman:dev .
           ./make.sh -s -U -i
       - name: nosetests
-        run: docker exec $(docker ps -f name=pman_dev_stack_pman_service.1 -q) nosetests --exe tests
+        run: docker exec $(docker ps -f name=pman_dev_stack_pman.1 -q) nosetests --exe tests
       - name: teardown
         run: |
           ./unmake.sh

diff --git a/README.rst b/README.rst
@@ -129,7 +129,7 @@ Docker Swarm:
 
 .. code-block:: bash
 
-    $> pman_dev=$(docker ps -f name=pman_dev_stack_pman_service.1 -q)
+    $> pman_dev=$(docker ps -f name=pman_dev_stack_pman.1 -q)
     $> docker exec $pman_dev mkdir -p /home/localuser/storeBase/key-chris-jid-1/incoming
     $> docker exec $pman_dev mkdir -p /home/localuser/storeBase/key-chris-jid-1/outgoing
     $> docker exec $pman_dev touch /home/localuser/storeBase/key-chris-jid-1/incoming/test.txt

diff --git a/make.sh b/make.sh
@@ -139,8 +139,8 @@ title -d 1 "Setting global exports..."
     fi
     echo -e "exporting STOREBASE=$STOREBASE "                      | ./boxes.sh
     export STOREBASE=$STOREBASE
-    echo -e "exporting SOURCEDIR=$HERE "                           | ./boxes.sh
-    export SOURCEDIR=$HERE
+    export SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+    echo -e "exporting SOURCEDIR=$SOURCEDIR "                           | ./boxes.sh
 windowBottom
 
 if (( ! b_skipIntro )) ; then
@@ -198,15 +198,11 @@ windowBottom
 title -d 1 "Starting pman containerized dev environment on $ORCHESTRATOR"
     if [[ $ORCHESTRATOR == swarm ]]; then
         echo "docker stack deploy -c swarm/docker-compose_dev.yml pman_dev_stack" | ./boxes.sh ${LightCyan}
-        windowBottom
-        docker stack deploy -c swarm/docker-compose_dev.yml pman_dev_stack >& dc.out > /dev/null
+        docker stack deploy -c swarm/docker-compose_dev.yml pman_dev_stack
     elif [[ $ORCHESTRATOR == kubernetes ]]; then
-        echo "envsubst < kubernetes/pman_dev.yaml | kubectl apply -f -" | ./boxes.sh ${LightCyan}
-        windowBottom
-        envsubst < kubernetes/pman_dev.yaml | kubectl apply -f - >& dc.out > /dev/null
+        echo "envsubst < kubernetes/pman_dev.yaml | kubectl apply -f -"           | ./boxes.sh ${LightCyan}
+        envsubst < kubernetes/pman_dev.yaml | kubectl apply -f -
     fi
-    echo -en "\033[2A\033[2K"
-    cat dc.out | sed -E 's/(.{80})/\1\n/g'                          | ./boxes.sh ${LightGreen}
 windowBottom
 
 title -d 1 "Waiting until pman container is running on $ORCHESTRATOR"
@@ -215,7 +211,7 @@ title -d 1 "Waiting until pman container is running on $ORCHESTRATOR"
     for i in {1..30}; do
         sleep 5
         if [[ $ORCHESTRATOR == swarm ]]; then
-            pman_dev=$(docker ps -f name=pman_dev_stack_pman_service.1 -q)
+            pman_dev=$(docker ps -f name=pman_dev_stack_pman.1 -q)
         elif [[ $ORCHESTRATOR == kubernetes ]]; then
             pman_dev=$(kubectl get pods --selector="app=pman,env=development" --field-selector=status.phase=Running --output=jsonpath='{.items[*].metadata.name}')
         fi

diff --git a/swarm/docker-compose_dev.yml b/swarm/docker-compose_dev.yml
@@ -11,7 +11,7 @@
 version: '3.7'
 
 services:
-  pman_service:
+  pman:
     image: ${PMANREPO:?}/pman:dev
     stdin_open: true # docker run -i
     tty: true        # docker run -t

diff --git a/unmake.sh b/unmake.sh
@@ -62,16 +62,12 @@ shift $(($OPTIND - 1))
 
 title -d 1 "Destroying pman containerized dev environment on $ORCHESTRATOR"
     if [[ $ORCHESTRATOR == swarm ]]; then
-        echo "docker stack rm pman_dev_stack"                               | ./boxes.sh ${LightCyan}
-        windowBottom
-        docker stack rm pman_dev_stack >& dc.out >/dev/null
+        echo "docker stack rm pman_dev_stack"                       | ./boxes.sh ${LightCyan}
+        docker stack rm pman_dev_stack
     elif [[ $ORCHESTRATOR == kubernetes ]]; then
-        echo "kubectl delete -f kubernetes/pman_dev.yaml"                   | ./boxes.sh ${LightCyan}
-        windowBottom
-        kubectl delete -f kubernetes/pman_dev.yaml >& dc.out >/dev/null
+        echo "kubectl delete -f kubernetes/pman_dev.yaml"           | ./boxes.sh ${LightCyan}
+        kubectl delete -f kubernetes/pman_dev.yaml
     fi
-    echo -en "\033[2A\033[2K"
-    cat dc.out | sed -E 's/(.{80})/\1\n/g'                          | ./boxes.sh ${LightGreen}
     echo "Removing ./FS tree"                                       | ./boxes.sh
     rm -fr ./FS
 windowBottom