Skip to content

Commit

Permalink
fix: pip upgrade typo, move Myna pip install to front
Browse files Browse the repository at this point in the history
  • Loading branch information
gknapp1 committed Sep 11, 2024
1 parent a065dd5 commit c3cf090
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions docker/ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Get Myna
ENV MYNA_DIR=/opt/myna
RUN MYNA_VERSION=main.tar.gz && \
MYNA_ARCHIVE=myna-${MYNA_VERSION} && \
MYNA_URL=https://github.com/ORNL-MDF/Myna/archive/refs/heads/${MYNA_VERSION} && \
wget --quiet ${MYNA_URL} --output-document=${MYNA_ARCHIVE} && \
mkdir -p ${MYNA_DIR} && \
tar -xf ${MYNA_ARCHIVE} -C ${MYNA_DIR} --strip-components=1 && \
rm -f ${MYNA_ARCHIVE} && \
python3 -m pip install --upgrade pip && \
python3 -m pip install ${MYNA_DIR} --root-user-action=ignore && \
python3 -m pip cache purge

# What we want to install and how we want to install it
# is specified in a manifest file (spack.yaml)
RUN mkdir -p /opt/spack-environment && \
Expand Down Expand Up @@ -72,20 +85,6 @@ RUN . /opt/spack-environment/activate.sh && \
cmake --install build
RUN echo 'export PATH="/opt/3DThesis/bin:$PATH"' >> activate.sh

# Get Myna
ENV MYNA_DIR=/opt/myna
RUN . /opt/spack-environment/activate.sh && \
MYNA_VERSION=main.tar.gz && \
MYNA_ARCHIVE=myna-${MYNA_VERSION} && \
MYNA_URL=https://github.com/ORNL-MDF/Myna/archive/refs/heads/${MYNA_VERSION} && \
wget --quiet ${MYNA_URL} --output-document=${MYNA_ARCHIVE} && \
mkdir -p ${MYNA_DIR} && \
tar -xf ${MYNA_ARCHIVE} -C ${MYNA_DIR} --strip-components=1 && \
rm -f ${MYNA_ARCHIVE} && \
python3 -m pip --upgrade && \
python3 -m pip install ${MYNA_DIR} --root-user-action=ignore && \
python3 -m pip cache purge

# Set entry point
RUN { \
echo '#!/bin/sh' \
Expand Down

0 comments on commit c3cf090

Please sign in to comment.