docker compose syntax updates and minor changes (#223)

Author: geographika

README.md

@@ -34,7 +34,7 @@ cd workshop
 ./geopython-workshop-ctl.sh stop
 ```
 
-Windows (Powershell or Command Prompt):
+Windows (PowerShell or Command Prompt):
 
 ```bat
 cd workshop
@@ -43,7 +43,7 @@ cd workshop
 .\win-geopython-workshop-ctl.bat stop
 ```
 
-Windows (Powershell + bash):
+Windows (PowerShell + bash):
 
 ```bash
 cd workshop

web/docs/docker.md

@@ -26,16 +26,6 @@ which is dependent on the system/OS you are running (e.g. Windows, Mac or Linux)
 system the Docker website provides detailed installation instructions. 
 Please follow these consistently.
 
-> Docker Compose in older (pre Compose v2) versions was a separate (Python) program to install,
-> though it was usually present in Docker Desktop. 
-> The `docker compose` command in that case is `docker-compose` (hyphened).
-> Since 2021, Docker Desktop includes Compose in the Docker CLI.
-> The command is then `docker compose` (space).
-    
-In our texts we will use `docker-compose`. Depending on your installation you may need
-to replace the hyphen (`-`) with a space. But you can always install the original
-compose (`docker-compose`) via `pip install docker-compose`.
-
 For many platforms a product called [Docker Desktop](https://docs.docker.com/desktop) is available, which includes the main Docker components:
 
 * Windows [installation](https://docs.Docker.com/desktop/install/windows-install)
@@ -52,12 +42,9 @@ Some notes:
 
 If all goes well, you should be able to run Docker from the command line as follows: [^2]
 
-<div class="termy">
-
 ```console
 $ docker --version
-Docker version 20.10.17, build 100c701
-$ docker-compose --version  
-Docker Compose version v2.6.1
+Docker version 29.4.0, build 9d7ad9f
+$ docker compose version
+Docker Compose version v5.1.1
 ```
-</div>

web/docs/index.md

@@ -44,43 +44,41 @@ Having said this, please feel free to bring your own! Examples:
 ## Verifying your environment
 
 Ensure Docker is running on your computer, then verify that the `docker`
-and `docker-compose` commands are working and available:
+and `docker compose` commands are working and available:
 
 
 ```console
 $ docker version
 
+$ docker compose version
+```
+
+If `docker compose` gives an error or is not available, your system may be
+using the legacy Docker Compose command. In that case, try:
+
+```console
 $ docker-compose --version
 ```
 
-If `docker-compose` gives a 'program not found' error:
+If the above command works, use `docker-compose` wherever the workshop
+documentation shows `docker compose`.
 
-> In recent versions of Docker the Docker Compose program is part
-> of the Docker CLI, thus following the `docker <cmd>` pattern. 
-> If `docker-compose --version` as above fails for you, 
-> try `docker compose version` (all spaces). If the latter command works
-> then use `docker compose` where the text shows `docker-compose`.
-> Note that our main Bash script `geopython-workshop-ctl.sh` (see below) will
-> figure out which variant you have installed and call the prober Docker Compose
-> command.
+Note that the workshop control scripts (`geopython-workshop-ctl.sh` and
+`win-geopython-workshop-ctl.bat`) automatically detect which Docker Compose
+variant is installed and invoke the appropriate command.
 
 ## Installation
 
 Below we will download and run the workshop content.
 
-<div class="termy">
-
 ```console
 curl -O https://codeload.github.com/geopython/geopython-workshop/zip/master
 unzip master
 cd geopython-workshop-master/workshop
 ```
-</div>
 
 Linux, macOS:
 
-<div class="termy">
-
 ```console
 // start the workshop
 
@@ -94,14 +92,11 @@ Linux, macOS:
 
 ./geopython-workshop-ctl.sh stop
 ```
-</div>
-
-Windows (Powershell or Command Prompt):
 
-<div class="termy">
+Windows (PowerShell or Command Prompt):
 
 ```console
-// start the workshop
+// start the workshop (from wthin the /workshop folder)
 
 .\win-geopython-workshop-ctl.bat start
 
@@ -114,25 +109,18 @@ Windows (Powershell or Command Prompt):
 .\win-geopython-workshop-ctl.bat stop
 ```
 
-</div>
-
 If the above `.sh` script does not work on your system 
-you can execute `docker-compose` directly via:
-
-<div class="termy">
+you can execute `docker compose` directly via:
 
 ```console
 // in dir geopython-workshop-master/workshop
-docker-compose up -d
+docker compose up -d
 docker logs --follow geopython-workshop-jupyter
 // look for URL+Token and Copy/Paste in browser
 ```
-</div>
 
 Below are utility commands. Use when stopped to clean and update.
 
-<div class="termy">
-
 ```console
 // update the workshop Docker Images in case of new versions
 
@@ -144,9 +132,6 @@ Below are utility commands. Use when stopped to clean and update.
 ./geopython-workshop-ctl.sh clean
 
 ```
-</div>
-
-
 
 ## Installation Issues
 

workshop/docker-compose-services.yml

@@ -1,7 +1,6 @@
 # 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
-# (or 'docker compose', space for dash, if your DOcker version mandates).
+# start: docker compose -f docker-compose-services.yml up -d
+# stop:                docker compose -f docker-compose-services.yml stop
 #
 # The Docker Network workshop_default is provided by and shared with
 # Workshop Jupyter notebook run from docker-compose.yml for remote API access.

workshop/jupyter/content/notebooks/04-vector-data.ipynb

@@ -38,7 +38,7 @@
     "There are currently [over 100 vector data formats](https://gdal.org/drivers/vector/index.html) used for storage, e.g. files, and for data transfer.\n",
     "The most common formats are presented below. \n",
     "\n",
-    "> Tip: [ogr2ogr](https://gdal.org/programs/ogr2ogr.html) is a GDAL/OGR commandline utility\n",
+    "> Tip: [gdal vector convert](https://gdal.org/en/stable/programs/gdal_vector_convert.html) is a GDAL commandline utility\n",
     "> that allows you to convert between most vector formats.  \n",
     "\n",
     "### ESRI Shapefile\n",
@@ -140,7 +140,7 @@
     "[PostGIS](https://postgis.net) adds support for geographic objects to the PostgreSQL object-relational database. \n",
     "In effect, PostGIS \"spatially enables\" the PostgreSQL server, allowing it to be \n",
     "used as a backend spatial database for geographic information systems (GIS), \n",
-    "much like ESRI's SDE or Oracle's Spatial extension. \n",
+    "much like Oracle's Spatial extension. \n",
     "PostGIS follows the OGC [Simple Features Specification for SQL](https://www.opengeospatial.org/standards/sfs) \n",
     "and has been certified as compliant with the \"Types and Functions\" profile. \n",
     "\n",
@@ -150,7 +150,7 @@
     "Within Python there is an ample choice of libraries to interact with vector data. The\n",
     "most popular are:\n",
     "\n",
-    "* [Python bindings](https://gdal.org/python/) for [GDAL OGR](https://gdal.org/), a.k.a. \"OGR\"\n",
+    "* [Python bindings](https://gdal.org/en/stable/api/python/index.html) for [GDAL](https://gdal.org/), a.k.a. [OGR](https://gdal.org/en/stable/glossary.html#term-OGR)\n",
     "* [Fiona](https://toblerity.org/fiona/manual.html) \n",
     "* [GeoPandas](https://geopandas.org/) \n",
     " \n",

workshop/jupyter/content/notebooks/09-publishing.ipynb

@@ -38,10 +38,8 @@
     "\n",
     "Do this in your shell in the `workshop` directory.\n",
     "\n",
-    "* start: `docker-compose -f docker-compose-services.yml up -d`\n",
-    "* stop: `docker-compose -f docker-compose-services.yml stop`\n",
-    "\n",
-    "(Or use `docker compose` i.s.o. `docker-compose` if you Docker-version mandates that format.)."
+    "* start: `docker compose -f docker-compose-services.yml up -d`\n",
+    "* stop: `docker compose -f docker-compose-services.yml stop`\n"
    ]
   },
   {

workshop/services/README.md

@@ -8,12 +8,14 @@ locally volume mounted configuration files which then, on docker container
 restart, will reflect updates made.
 
 ## Running
+
 Optional services - not for regular workshop.
 
-* start: docker-compose -f docker-compose-services.yml up -d
-* stop: docker-compose -f docker-compose-services.yml stop
+* start: docker compose -f docker-compose-services.yml up -d
+* stop: docker compose -f docker-compose-services.yml stop
 
 While running you can publish data, and then restart each individual container. See below.
+
 ## Publishing Data
 
 Basic workflow: