From 0d3461c5c778b64a6b8127af9043e5680ef35b30 Mon Sep 17 00:00:00 2001
From: Dean Roehrich <dean.roehrich@hpe.com>
Date: Tue, 26 Nov 2024 09:01:39 -0600
Subject: [PATCH] Upgrade openmpi-builder and openmpi (#27)

Update to openmpi-builder 0.6.0 and openmpi 4.1.7.

Signed-off-by: Dean Roehrich <dean.roehrich@hpe.com>
---
 Dockerfile | 10 +++++++---
 Makefile   |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e55011..4fe68dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG OPENMPI_VERSION=4.1.6
 
-FROM mpioperator/openmpi-builder:v0.5.0 AS builder
+# These ARGs must be before the first FROM. This allows them to be valid for
+# use in FROM instructions.
+ARG MPI_OPERATOR_VERSION=0.6.0
+ARG OPENMPI_VERSION=4.1.7
+
+FROM mpioperator/openmpi-builder:v$MPI_OPERATOR_VERSION AS builder
 
 ARG OPENMPI_VERSION
 ENV OPENMPI_VERSION=$OPENMPI_VERSION
@@ -102,7 +106,7 @@ RUN wget https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-$OPENMPI_VE
     && make all install
 
 ###############################################################################
-FROM mpioperator/openmpi:v0.5.0 AS production
+FROM mpioperator/openmpi:v$MPI_OPERATOR_VERSION AS production
 
 ARG OPENMPI_VERSION
 ENV OPENMPI_VERSION=$OPENMPI_VERSION
diff --git a/Makefile b/Makefile
index 7ccd2e2..e786eef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Hewlett Packard Enterprise Development LP
+# Copyright 2021-2024 Hewlett Packard Enterprise Development LP
 # Other additional copyright holders may be indicated within.
 #
 # The entirety of this work is licensed under the Apache License,
@@ -19,8 +19,9 @@
 IMAGE_TAG_BASE ?= ghcr.io/nearnodeflash/nnf-mfu
 
 docker-build: VERSION ?= $(shell cat .version)
+docker-build: TARGET ?= production
 docker-build: .version
-	docker build --target production -t $(IMAGE_TAG_BASE):$(VERSION) .
+	docker build --target $(TARGET) -t $(IMAGE_TAG_BASE):$(VERSION) .
 
 docker-build-debug: VERSION ?= $(shell cat .version)
 docker-build-debug: IMAGE_TAG_BASE := $(IMAGE_TAG_BASE)-debug