Skip to content

Commit

Permalink
Merge release v0.1.4
Browse files Browse the repository at this point in the history
Release v0.1.4
  • Loading branch information
roehrich-hpe authored Dec 9, 2024
2 parents eb38ca3 + 781a403 commit dcee85b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
12 changes: 8 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -67,7 +71,7 @@ RUN wget https://github.com/llnl/dtcmp/releases/download/v1.1.1/dtcmp-1.1.1.tar.

# Until a new release of mpifileutils is cut, we need to use a tagged commit on
# our fork to include our dcp changes (i.e. --uid, --gid)
RUN git clone --depth 1 https://github.com/nearnodeflash/mpifileutils.git --branch nnf-stable-v2 \
RUN git clone --depth 1 https://github.com/nearnodeflash/mpifileutils.git --branch nnf-stable-v3 \
&& mkdir build \
&& cd build \
&& cmake ../mpifileutils \
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand Down

0 comments on commit dcee85b

Please sign in to comment.