Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove Ruby from docker setup, use Node.

Browse Source
This commit is contained in:
Daniel Patterson 2016-05-13 12:32:36 -07:00
parent 73113f5eb8
commit 96c73baeb3
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/Dockerfile
View File

@ -5,15 +5,23 @@ RUN apt-get install -y build-essential git-core python-pip python-software-prope
RUN apt-get -y install gcc-4.8 g++-4.8 libboost1.55-all-dev llvm-3.4 RUN apt-get -y install gcc-4.8 g++-4.8 libboost1.55-all-dev llvm-3.4
RUN apt-get -y install libbz2-dev libstxxl-dev libstxxl1 libxml2-dev RUN apt-get -y install libbz2-dev libstxxl-dev libstxxl1 libxml2-dev
RUN apt-get -y install libzip-dev lua5.1 liblua5.1-0-dev libtbb-dev libgdal-dev ruby1.9 RUN apt-get -y install libzip-dev lua5.1 liblua5.1-0-dev libtbb-dev libgdal-dev
RUN apt-get -y install curl cmake cmake-curses-gui RUN apt-get -y install curl cmake cmake-curses-gui
RUN pip install awscli RUN pip install awscli
# luabind # luabind
RUN curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash RUN curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
WORKDIR /opt
RUN git clone --depth 1 --branch v0.31.0 https://github.com/creationix/nvm.git
RUN /bin/bash -c "source /opt/nvm/nvm.sh && nvm install v4"
RUN useradd -ms /bin/bash mapbox RUN useradd -ms /bin/bash mapbox
USER mapbox USER mapbox
ENV HOME /home/mapbox ENV HOME /home/mapbox
WORKDIR /home/mapbox WORKDIR /home/mapbox
RUN echo "source /opt/nvm/nvm.sh" > .bashrc
RUN echo "source /home/mapbox/.bashrc" > .profile

2
docker/run-clang.sh
View File

@ -8,4 +8,4 @@ docker run \
-e "CXX=clang++" \ -e "CXX=clang++" \
-v `pwd`:/home/mapbox/osrm-backend \ -v `pwd`:/home/mapbox/osrm-backend \
-t mapbox/osrm:linux \ -t mapbox/osrm:linux \
osrm-backend/docker/test.sh /bin/bash -lc "osrm-backend/docker/test.sh"

2
docker/run-gcc.sh
View File

@ -8,4 +8,4 @@ docker run \
-e "CXX=g++" \ -e "CXX=g++" \
-v `pwd`:/home/mapbox/osrm-backend \ -v `pwd`:/home/mapbox/osrm-backend \
-t mapbox/osrm:linux \ -t mapbox/osrm:linux \
osrm-backend/docker/test.sh /bin/bash -lc "osrm-backend/docker/test.sh"

11
docker/test.sh
View File

@ -4,11 +4,8 @@ set -e
set -o pipefail set -o pipefail
export CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release" export CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release"
export PATH=$PATH:/home/mapbox/.gem/ruby/1.9.1/bin:/home/mapbox/osrm-backend/vendor/bundle/ruby/1.9.1/bin
cd /home/mapbox/osrm-backend cd /home/mapbox/osrm-backend
gem install --user-install bundler
bundle install --path vendor/bundle
[ -d build ] && rm -rf build [ -d build ] && rm -rf build
mkdir -p build mkdir -p build
cd build cd build
@ -16,7 +13,9 @@ cmake .. $CMAKEOPTIONS -DBUILD_TOOLS=1
make -j`nproc` make -j`nproc`
make tests -j`nproc` make tests -j`nproc`
./datastructure-tests #./unit_tests/server-tests
./algorithm-tests #./unit_tests/library-tests
#./unit_tests/extractor-tests
#./unit_tests/util-tests
cd .. cd ..
bundle exec cucumber -p verify npm test