From 0ea002687d2e38eeca53aed2ea6a12c84363d075 Mon Sep 17 00:00:00 2001 From: Ray Zimmerman Date: Fri, 14 Jun 2024 10:03:36 -0600 Subject: [PATCH] Update documentation regarding Docker tags. --- docker/Docker-Build-Notes.md | 2 ++ docker/MATPOWER-Docker.md | 35 +++++++++++++++++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docker/Docker-Build-Notes.md b/docker/Docker-Build-Notes.md index fec70b06..947b8133 100644 --- a/docker/Docker-Build-Notes.md +++ b/docker/Docker-Build-Notes.md @@ -31,6 +31,8 @@ When a new version _x.y.z_ of the GNU Octave Docker image - Manually update README files for [`matpower/octave`][1] and [`matpower/matpower`][7] on DockerHub from [Octave-Docker.md][6] and [MATPOWER-Docker.md][5], respectively. + **Note:** _The latter gets overwritten by any push to the GitHub master + branch._ MATPOWER Images ([`matpower/matpower`][7]) (v7.0+) diff --git a/docker/MATPOWER-Docker.md b/docker/MATPOWER-Docker.md index d4daf7e1..277cd469 100644 --- a/docker/MATPOWER-Docker.md +++ b/docker/MATPOWER-Docker.md @@ -95,24 +95,23 @@ the `master` branch of the [MATPOWER][5] and [MATPOWER Extras][6] GitHub repositories. -| tag | MATPOWER version | Octave version | -| -------------------- | :----------------: | :---------------: | -| **_development versions_** | | | -| `dev-latest` | _latest_ `master` | _current release_ | -| `dev-latest-` | _latest_ `master` | _x.y.z_ | -| `dev-` | `master` _on date_ | _current release_ | -| | | | -| **_release versions_** | | | -| `latest` | _current release_ | _current release_ | -| `c` | _X.Y_ | _current release_ | -| `8.0` | 8.0 | 9.1.0 | -| `7.1` | 7.1 | 5.2.0 | -| `7.0` | 7.0 | 5.1.0 | -| `6.0` | 6.0 | 4.2.2 | -| `5.1` | 5.1 | 4.0.3 | -| `5.0` | 5.0 | 4.0.3 | -| `4.1` | 4.1 | 4.0.3 | -| `4.0` | 4.0 | 4.0.3 | +| tag | MATPOWER version | Octave version | +| -------------------------- | :----------------: | :---------------: | +| **_development versions_** | | | +| `dev-latest` | _latest_ `master` | _current release_ | +| `dev--` | `master` _on date_ | _x.y.z_ | +| | | | +| **_release versions_** | | | +| `latest` | _current release_ | _current release_ | +| `c` | _X.Y_ | _current release_ | +| `8.0` | 8.0 | 9.1.0 | +| `7.1` | 7.1 | 5.2.0 | +| `7.0` | 7.0 | 5.1.0 | +| `6.0` | 6.0 | 4.2.2 | +| `5.1` | 5.1 | 4.0.3 | +| `5.0` | 5.0 | 4.0.3 | +| `4.1` | 4.1 | 4.0.3 | +| `4.0` | 4.0 | 4.0.3 | ---