Skip to content

Commit

Permalink
Update docker again to change core_version->mach3_core_version
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry Wallace committed Jan 25, 2025
1 parent 4138a29 commit cb38cbd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/MaCh3DockerFiles/Alma9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM picker24/root_v6_26_10:alma9 AS mach3dune_build

# Declare the build argument
ARG MACH3_DUNE_VERSION
ARG CORE_VERSION
ARG MACH3_CORE_VERSION

ENV MACH3_DUNE_VERSION=${MACH3_DUNE_VERSION:-develop}

Expand All @@ -19,7 +19,7 @@ RUN git checkout ${MACH3_DUNE_VERSION}
RUN mkdir -p ${MACH3_DUNE_INSTALL_DIR}
WORKDIR ${MACH3_DUNE_INSTALL_DIR}

RUN if [ -n "$CORE_VERSION" ]; then \
RUN if [ -n "$MACH3_CORE_VERSION" ]; then \
cmake ../ -DMaCh3_Branch=${CORE_VERSION}; \
else \
cmake ../; \
Expand Down
4 changes: 2 additions & 2 deletions doc/MaCh3DockerFiles/Rocky9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM picker24/root_v6_26_10:alma9 AS mach3dune_build

# Declare the build argument
ARG MACH3_DUNE_VERSION
ARG CORE_VERSION
ARG MACH3_CORE_VERSION
ENV MACH3_DUNE_VERSION=${MACH3_DUNE_VERSION:-develop}

ENV MACH3_DUNE_WORK_DIR=/opt/MaCh3DUNE/
Expand All @@ -17,7 +17,7 @@ RUN git checkout ${MACH3_DUNE_VERSION}
RUN mkdir -p ${MACH3_DUNE_INSTALL_DIR}
WORKDIR ${MACH3_DUNE_INSTALL_DIR}

RUN if [ -n "$CORE_VERSION" ]; then \
RUN if [ -n "$MACH3_CORE_VERSION" ]; then \
cmake ../ -DMaCh3_Branch=${CORE_VERSION}; \
else \
cmake ../; \
Expand Down

0 comments on commit cb38cbd

Please sign in to comment.