#156 rebuild and test Dockerfile and notebooks - minor updates scripts (#161)

* #156 rebuild and test Dockerfile and notebooks - minor updates scripts

* #156 remove build.log file from GH

Author: justb4

workshop/docker-compose-services.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 # Optional services - not for regular workshop like FOSS4G.
 # start: docker-compose -f docker-compose-services.yml up -d
 # stop:                docker-compose -f docker-compose-services.yml stop
@@ -29,6 +27,6 @@ services:
 
 networks:
   default:
-    external:
-      # Provided by and shared with the Workshop Jupyter Notebook.
-      name: workshop_default
+    # Provided by and shared with the Workshop Jupyter Notebook.
+    name: workshop_default
+    external: true

workshop/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   jupyter:
     container_name: geopython-workshop-jupyter
@@ -8,3 +6,11 @@ services:
       - 8888:8888
     volumes:
       - ./jupyter/content:/jupyter/content:rw
+#networks:
+#  default:
+#    # Provided by and shared with the services; create and
+#    # enable only when using docker-compose-services.yml as well via:
+#    #    docker network create --driver bridge workshop_default
+#    # this is not part of the standard workshop agenda/chapters
+#    name: workshop_default
+#    external: true

workshop/geopython-workshop-ctl.sh

@@ -48,7 +48,8 @@ elif [ $1 == "url" ]; then
       openapp="cmd /c start"
     fi
 
-    url=$(docker logs geopython-workshop-jupyter 2>&1 | grep "    or http" | sed 's/     or //')
+    # Filter the URL from the log output
+    url=$(docker logs geopython-workshop-jupyter 2>&1 | grep "http://127.0.0.1" | tail -n 1 | xargs)
     if [ -z ${url} ]; then
         echo "workshop not started"
         echo "did you start the workshop? (i.e. bash $0 start)"