Update Docker related files for Octave 8.3 and 8.4.

MATPOWER · Feb 6, 2024 · 586b64f · 586b64f
1 parent 6311973
commit 586b64f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/docker/Dockerfile-octave b/docker/Dockerfile-octave
@@ -1,15 +1,15 @@
 # Builds a Docker image for Octave with IPOPT, OSQP, SDTP3, SeDuMi and
 # YALMIP pre-installed. Use --build-arg VER=x.y.z for a
-# specific version of Octave (default is 6.4.0).
+# specific version of Octave (default is 8.4.0).
 #
 # docker build -f docker/Dockerfile-octave -t matpower/matpower:latest .
-# docker build --build-arg VER=6.4.0 -f docker/Dockerfile-octave -t matpower/octave:6.4.0 .
+# docker build --build-arg VER=8.4.0 -f docker/Dockerfile-octave -t matpower/octave:8.4.0 .
 #
 # Authors:
 # Xiangmin Jiao <[email protected]>
 # Ray Zimmerman <[email protected]>
 
-ARG VER=7.3.0
+ARG VER=8.4.0
 ARG SKIP_IPOPT=0
 ARG SKIP_OSQP=0
 FROM gnuoctave/octave:${VER} AS base

diff --git a/docker/MATPOWER-Docker.md b/docker/MATPOWER-Docker.md
@@ -89,7 +89,7 @@ Versions
 Several images are available with different combinations of
 [MATPOWER][1] and [GNU Octave][8] versions, with the following tags and
 naming conventions. Here _current release_ means the most recent
-numbered release (currently 7.1 for [MATPOWER][1], and 7.3.0 for
+numbered release (currently 7.1 for [MATPOWER][1], and 8.4.0 for
 [Octave][8]) and _latest_ `master` refers to the most recent build from
 the `master` branch of the [MATPOWER][5] and [MATPOWER Extras][6]
 GitHub repositories.

diff --git a/docker/Octave-Docker.md b/docker/Octave-Docker.md
@@ -13,6 +13,7 @@ version of the Octave image being used.
 
 | Octave Version | [IPOPT][8] | [OSQP][9] | [SeDuMi][10] | [SDP3][11] | [YALMIP][12] |
 | :------------: | :--------: | :-------: | :----------: | :--------: | :----------: |
+|     8.x.x      |  &check;   |  &check;  |   &check;    |  &check;   |   &check;    |
 |     7.x.x      |  &check;   |  &check;  |   &check;    |  &check;   |   &check;    |
 |     6.x.x      |  &check;   |  &check;  |   &check;    |  &check;   |   &check;    |
 |     5.x.x      |  &check;   |  &check;  |   &check;    |  &check;   |   &check;    |

diff --git a/docker/build_octave_images.sh b/docker/build_octave_images.sh
@@ -21,8 +21,10 @@ docker build --build-arg VER=6.4.0 -f docker/Dockerfile-octave -t matpower/octav
 docker build --build-arg VER=7.1.0 -f docker/Dockerfile-octave -t matpower/octave:7.1.0 .
 docker build --build-arg VER=7.2.0 -f docker/Dockerfile-octave -t matpower/octave:7.2.0 .
 docker build --build-arg VER=7.3.0 -f docker/Dockerfile-octave -t matpower/octave:7.3.0 .
+docker build --build-arg VER=8.3.0 -f docker/Dockerfile-octave -t matpower/octave:8.3.0 .
+docker build --build-arg VER=8.4.0 -f docker/Dockerfile-octave -t matpower/octave:8.4.0 .
 # docker build -f docker/Dockerfile-octave -t matpower/octave:latest .
-docker tag matpower/octave:7.3.0 matpower/octave:latest
+docker tag matpower/octave:8.4.0 matpower/octave:latest
 
 # for debugging, may want to try:
 #   DOCKER_BUILDKIT=0 docker build ...