Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removing CGAL from v3 #9

Merged
merged 1 commit into from
Mar 6, 2019
Merged

removing CGAL from v3 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions 3.0.0-dev/pg11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ FROM pgrouting/postgres:pg11

# Environment
ENV PGROUTING_VERSION develop
ENV CGAL_VERSION 4.9
ENV OSM2PGR_VERSION 2.3.5
ENV OSM2PGR_VERSION 2.3.6

# Sources
ADD https://github.com/pgRouting/pgrouting/archive/${PGROUTING_VERSION}.tar.gz $ROOTDIR/src/
ADD https://github.com/CGAL/cgal/archive/releases/CGAL-${CGAL_VERSION}.tar.gz $ROOTDIR/src/
ADD https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGR_VERSION}.tar.gz $ROOTDIR/src/
ADD resources/compile.sh $ROOTDIR/src/

Expand Down
15 changes: 2 additions & 13 deletions 3.0.0-dev/pg11/resources/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Compilation of CGAL, pgRouting and osm2pgrouting
# Compilation of pgRouting and osm2pgrouting

# Install osm2pgrouting prerequisites
# Install prerequisites
apt-get update -y \
&& apt-get install -y \
cmake \
Expand All @@ -15,20 +15,9 @@ apt-get update -y \
libosmium2-dev

# Untar
cd $ROOTDIR/src ; tar -xvf CGAL-${CGAL_VERSION}.tar.gz ; cd ..
cd $ROOTDIR/src ; tar -xvf ${PGROUTING_VERSION}.tar.gz ; cd ..
cd $ROOTDIR/src ; tar -xvf v${OSM2PGR_VERSION}.tar.gz ; cd ..

# Compilation of CGAL
cd $ROOTDIR/src/cgal-releases-CGAL-${CGAL_VERSION}
mkdir build
cd build
cmake ..
make
make install
ldconfig
cd ../../..

# Compilation of pgRouting
cd $ROOTDIR/src/pgrouting-${PGROUTING_VERSION}
mkdir build
Expand Down