Skip to content

Commit

Permalink
fix docker dep build order.
Browse files Browse the repository at this point in the history
  • Loading branch information
michelp committed Sep 2, 2021
1 parent aaa6778 commit 2f4a8bc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
5 changes: 2 additions & 3 deletions Dockerfile-minimal
Expand Up @@ -6,10 +6,9 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /pygraphblas
ADD minimal-requirements.txt /pygraphblas
RUN pip3 install -r minimal-requirements.txt

ADD . /pygraphblas

RUN python3 setup.py develop
RUN python3 setup.py install
RUN pip3 install -r minimal-requirements.txt
RUN ldconfig
6 changes: 2 additions & 4 deletions Dockerfile-notebook
Expand Up @@ -8,12 +8,10 @@ RUN conda install -y graphviz

WORKDIR /home/jovyan

ADD notebook-requirements.txt /home/jovyan
RUN pip3 install -r notebook-requirements.txt

ADD . /home/jovyan

RUN python setup.py develop
RUN python setup.py install
RUN pip3 install -r notebook-requirements.txt
RUN chown -R jovyan /home/jovyan

RUN ldconfig
Expand Down
20 changes: 7 additions & 13 deletions docker_build.sh
@@ -1,22 +1,16 @@
if [ $# -eq 0 ]
then
echo "Usage: ./docker_build.sh SS_RELEASE PY_RELEASE BASE_NAME BRANCH [LOCATION PUSH]"
echo "Usage: ./docker_build.sh PY_RELEASE BASE_NAME BRANCH [LOCATION PUSH]"
echo
echo "Example: ./docker_build.sh v3.3.3 v3.4.0 notebook main clone push"
echo "Example: ./docker_build.sh 5.1.7.1 notebook main clone push"
exit 1
fi

SS_RELEASE=$1
PY_RELEASE=$2
BASE_NAME=$3
BRANCH=$4
LOCATION=$5
PUSH=$6

# for BASE_NAME=notebook image
# set env var to 1 for faster SuiteSparse compilation, but the code will be slower
SS_COMPACT=${SS_COMPACT:-0}
SS_BURBLE=${SS_BURBLE:-0}
PY_RELEASE=$1
BASE_NAME=$2
BRANCH=$3
LOCATION=$4
PUSH=$5

if [ "$LOCATION" = "clone" ]
then
Expand Down

0 comments on commit 2f4a8bc

Please sign in to comment.