Skip to content

Commit

Permalink
update docker scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
timkpaine committed May 22, 2019
1 parent 11da463 commit 7248579
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM timkpaine/aat:latest
WORKDIR /usr/src/app
ADD . /usr/src/app

RUN python3 -m pip install codecov nose2 mock flake8 pylint
RUN python3 -m pip install -U codecov pytest mock flake8 pylint
RUN python3 -m pip install -r requirements.txt

RUN DOCKER=true make test
Expand Down
4 changes: 3 additions & 1 deletion scripts/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ ADD . /usr/src/app

RUN apt-get update
RUN apt-get -y install apt-transport-https libtbb-dev cmake
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get install -y nodejs
RUN npm install -g yarn
RUN apt-get -y remove python3

RUN python3.7 -m pip install numpy
Expand All @@ -18,4 +21,3 @@ RUN cd boost_1_67_0 && CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:/usr/local/includ

RUN ln -s /usr/local/lib/libboost_python37.so /usr/local/lib/libboost_python.so
RUN ln -s /usr/local/lib/libboost_numpy37.so /usr/local/lib/libboost_numpy.so

0 comments on commit 7248579

Please sign in to comment.