Changed docker build context for iotstack menus

Author: Slyke

.internal/api.Dockerfile

@@ -3,7 +3,7 @@ FROM node:14
 WORKDIR /usr/iotstack_api
 
 # node_modules is ignored with this copy, as specified in .dockerignore
-COPY ./.internal/api ./
+COPY ./api ./
 RUN npm install
 
 EXPOSE 32128

.internal/ctrl_api.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-source ./.internal/meta.sh
+CPWD=$(pwd)
+
+cd .internal/ 2>/dev/null
+
+source ./meta.sh
 DNAME=iostack_api
 FULL_NAME="$DNAME:$VERSION"
 
@@ -147,3 +151,5 @@ else
     echo "IOTstack API Server is running. Check port: $API_PORT or run 'docker ps'"
   fi
 fi
+
+cd $CPWD

.internal/ctrl_pycli.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-source ./.internal/meta.sh
+CPWD=$(pwd)
+
+cd .internal/ 2>/dev/null
+
+source ./meta.sh
 DNAME=iostack_pycli
 FULL_NAME="$DNAME:$VERSION"
 
@@ -111,3 +115,5 @@ else
     echo "IOTstack CLI is running. Check with 'docker ps'."
   fi
 fi
+
+cd $CPWD

.internal/ctrl_wui.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-source ./.internal/meta.sh
+CPWD=$(pwd)
+
+cd .internal/ 2>/dev/null
+
+source ./meta.sh
 DNAME=iostack_wui
 FULL_NAME="$DNAME:$VERSION"
 
@@ -85,3 +89,5 @@ else
 
   # docker run -p $WUI_PORT:$WUI_PORT -it $FULL_NAME /bin/bash
 fi
+
+cd $CPWD

.internal/docker_menu.sh

@@ -1,11 +1,17 @@
 #!/bin/bash
 
+CPWD=$(pwd)
+
+cd .internal/ 2>/dev/null
+
 if [ "$1" = "stop" ]; then
-  bash ./.internal/ctrl_api.sh stop
-  bash ./.internal/ctrl_wui.sh stop
-  bash ./.internal/ctrl_pycli.sh stop
+  bash ./ctrl_api.sh stop
+  bash ./ctrl_wui.sh stop
+  bash ./ctrl_pycli.sh stop
 else
-  bash ./.internal/ctrl_api.sh
-  bash ./.internal/ctrl_wui.sh
-  bash ./.internal/ctrl_pycli.sh
+  bash ./ctrl_api.sh
+  bash ./ctrl_wui.sh
+  bash ./ctrl_pycli.sh
 fi
+
+cd $CPWD

.internal/pycli.Dockerfile

@@ -2,7 +2,7 @@ FROM python:3
 
 WORKDIR /usr/iotstack_pycli
 
-COPY ./.internal/pycli ./
+COPY ./pycli ./
 RUN pip install --no-cache-dir -r requirements.txt
 
 CMD [ "python", "./entry.py" ]

.internal/wui.Dockerfile

@@ -3,7 +3,7 @@ FROM node:14
 WORKDIR /usr/iotstack_wui
 
 # node_modules is ignored with this copy, as specified in .dockerignore
-COPY ./.internal/wui ./
+COPY ./wui ./
 RUN npm install
 RUN npm run build
 

.internal/wui/wui.dev.Dockerfile

@@ -3,7 +3,7 @@ FROM node:14
 WORKDIR /usr/iotstack_wui
 
 # node_modules is ignored with this copy, as specified in .dockerignore
-COPY ./.internal/wui ./
+COPY ./wui ./
 RUN npm install
 
 EXPOSE 32777

menu.sh

@@ -194,11 +194,17 @@ else
     sleep 1
     echo ""
 
+    # Change directory to .internal for docker build
+    CPWD=$(pwd)
+    cd .internal/
+
     # Build all asynchronously, so it's faster. Give PyCLI a slight headstart to keep the user waiting the shortest time.
-    docker build --quiet -t iostack_pycli:$VERSION -f ./.internal/pycli.Dockerfile . > /dev/null &
+    docker build --quiet -t iostack_pycli:$VERSION -f ./pycli.Dockerfile . > /dev/null &
     sleep 1
-    docker build --quiet -t iostack_api:$VERSION -f ./.internal/api.Dockerfile . > /dev/null &
-    docker build --quiet -t iostack_wui:$VERSION -f ./.internal/wui.Dockerfile . > /dev/null &
+    docker build --quiet -t iostack_api:$VERSION -f ./api.Dockerfile . > /dev/null &
+    docker build --quiet -t iostack_wui:$VERSION -f ./wui.Dockerfile . > /dev/null &
+
+    cd $CPWD # Change back to previous directory.
 
     SLEEP_COUNTER=0
     API_REBUILD_DONE="not completed"
@@ -284,9 +290,15 @@ fi
 # If PyCLI is already running then reattach
 PYCLI_ID="$(docker ps --format '{{.ID}} {{.Image}}' | grep -w iostack_pycli:$VERSION | cut -d ' ' -f1 | head -n 1)"
 if [[ "$PYCLI_ID" == "" ]]; then
-  bash ./.internal/docker_menu.sh
+  CPWD=$(pwd)
+  cd .internal/
+  bash ./docker_menu.sh
+  cd $CPWD
 else
-  bash ./.internal/ctrl_api.sh > /dev/null
+  CPWD=$(pwd)
+  cd .internal/
+  bash ./ctrl_api.sh > /dev/null
+  cd $CPWD
   echo "PyCLI menu is already running. Reattaching..."
   docker attach --sig-proxy=false $PYCLI_ID
 fi