Merge pull request #12 from aruneko/simplify-docker-image

Simplify docker image
pgRouting · Jul 18, 2019 · ee375ea · ee375ea
2 parents fd634c6 + fd74b6f
commit ee375ea
Show file tree

Hide file tree

Showing 45 changed files with 530 additions and 1,284 deletions.
diff --git a/2.6.1/pg10/Dockerfile b/2.6.1/pg10/Dockerfile
@@ -1,16 +1,47 @@
-FROM pgrouting/postgres:pg10
+FROM postgres:10
 
-# Environment
+ENV POSTGIS_MAJOR 2.5
 ENV PGROUTING_VERSION 2.6.1
-ENV CGAL_VERSION 4.9
-ENV OSM2PGR_VERSION 2.3.5
 
-# Sources
-ADD https://github.com/pgRouting/pgrouting/archive/v${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/
-
-# Compilation
-RUN chmod 777 $ROOTDIR/src/compile.sh
-RUN $ROOTDIR/src/compile.sh
+RUN apt update \
+ && apt install -y \
+        build-essential \
+        cmake \
+        perl \
+        wget \
+        libboost-graph-dev \
+        libcgal-dev \
+        libpq-dev \
+        postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR} \
+        postgresql-server-dev-${PG_MAJOR} \
+ && cd /usr/local/src \
+ && wget https://github.com/pgRouting/pgrouting/archive/v${PGROUTING_VERSION}.tar.gz \
+ && tar xvf v${PGROUTING_VERSION}.tar.gz \
+ && cd pgrouting-${PGROUTING_VERSION} \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+ && cd ../../ \
+ && rm -rf ./* \
+ && apt purge -y \
+        build-essential \
+        cmake \
+        perl \
+        wget \
+        libcgal-dev \
+        libpq-dev \
+        postgresql-server-dev-${PG_MAJOR} \
+ && apt install -y \
+        postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}-scripts \
+        libboost-atomic1.62.0 \
+        libboost-chrono1.62.0 \
+        libboost-graph1.62.0 \
+        libboost-date-time1.62.0 \
+        libboost-program-options1.62.0 \
+        libboost-system1.62.0 \
+        libboost-thread1.62.0 \
+        libcgal12 \
+ && apt autoremove -y \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/2.6.1/pg10/README.md b/2.6.1/pg10/README.md
@@ -1,3 +1,3 @@
 # pgRouting 2.6.1 (pg10)
 
-pgRouting Docker image (version 2.6.1) built over [Postgres 10 with PostGIS](../../postgres/pg10) and dependencies.
+pgRouting Docker image (version 2.6.1) built over [Postgres 10](https://hub.docker.com/_/postgres) and dependencies.
diff --git a/2.6.1/pg10/docker-compose.yml b/2.6.1/pg10/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - db-data:/data
+      - db-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWD=postgres
+      - POSTGRES_PASSWORD=postgres
 volumes:
   db-data:
diff --git a/2.6.1/pg10/extra/Dockerfile b/2.6.1/pg10/extra/Dockerfile
@@ -0,0 +1,44 @@
+FROM pgrouting/pgrouting:2.6.1-10
+
+ENV OSM2PGROUTING_VERSION 2.3.6
+
+RUN apt update \
+ && apt install -y \
+        build-essential \
+        cmake \
+        wget \
+        libboost-program-options-dev \
+        libexpat1 \
+        libexpat-dev \
+        libosmium2-dev \
+        libpqxx-dev \
+        zlib1g-dev \
+ && cd /usr/local/src \
+ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \
+ && tar xvf v${OSM2PGROUTING_VERSION}.tar.gz \
+ && cd osm2pgrouting-${OSM2PGROUTING_VERSION} \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+ && cd ../tools/osmium/ \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+ && cd /usr/local/src \
+ && rm -rf ./* \
+ && apt purge -y \
+        build-essential \
+        cmake \
+        wget \
+        libexpat-dev \
+        libosmium2-dev \
+        libpqxx-dev \
+        zlib1g-dev \
+ && apt install -y \
+        libpqxx-4.0v5 \
+ && apt autoremove -y \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/2.6.1/pg10/resources/compile.sh b/2.6.1/pg10/resources/compile.sh
diff --git a/2.6.1/pg11/Dockerfile b/2.6.1/pg11/Dockerfile
@@ -1,16 +1,47 @@
-FROM pgrouting/postgres:pg11
+FROM postgres:11
 
-# Environment
+ENV POSTGIS_MAJOR 2.5
 ENV PGROUTING_VERSION 2.6.1
-ENV CGAL_VERSION 4.9
-ENV OSM2PGR_VERSION 2.3.5
 
-# Sources
-ADD https://github.com/pgRouting/pgrouting/archive/v${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/
-
-# Compilation
-RUN chmod 777 $ROOTDIR/src/compile.sh
-RUN $ROOTDIR/src/compile.sh
+RUN apt update \
+ && apt install -y \
+        build-essential \
+        cmake \
+        perl \
+        wget \
+        libboost-graph-dev \
+        libcgal-dev \
+        libpq-dev \
+        postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR} \
+        postgresql-server-dev-${PG_MAJOR} \
+ && cd /usr/local/src \
+ && wget https://github.com/pgRouting/pgrouting/archive/v${PGROUTING_VERSION}.tar.gz \
+ && tar xvf v${PGROUTING_VERSION}.tar.gz \
+ && cd pgrouting-${PGROUTING_VERSION} \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+ && cd ../../ \
+ && rm -rf ./* \
+ && apt purge -y \
+        build-essential \
+        cmake \
+        perl \
+        wget \
+        libcgal-dev \
+        libpq-dev \
+        postgresql-server-dev-${PG_MAJOR} \
+ && apt install -y \
+        postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}-scripts \
+        libboost-atomic1.62.0 \
+        libboost-chrono1.62.0 \
+        libboost-graph1.62.0 \
+        libboost-date-time1.62.0 \
+        libboost-program-options1.62.0 \
+        libboost-system1.62.0 \
+        libboost-thread1.62.0 \
+        libcgal12 \
+ && apt autoremove -y \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/2.6.1/pg11/README.md b/2.6.1/pg11/README.md
@@ -1,3 +1,3 @@
 # pgRouting 2.6.1 (pg11)
 
-pgRouting Docker image (version 2.6.1) built over [Postgres 11 with PostGIS](../../postgres/pg11) and dependencies.
+pgRouting Docker image (version 2.6.1) built over [Postgres 11](https://hub.docker.com/_/postgres) and dependencies.
diff --git a/2.6.1/pg11/docker-compose.yml b/2.6.1/pg11/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - db-data:/data
+      - db-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWD=postgres
+      - POSTGRES_PASSWORD=postgres
 volumes:
   db-data:
diff --git a/2.6.1/pg11/extra/Dockerfile b/2.6.1/pg11/extra/Dockerfile
@@ -0,0 +1,44 @@
+FROM pgrouting/pgrouting:2.6.1-11
+
+ENV OSM2PGROUTING_VERSION 2.3.6
+
+RUN apt update \
+ && apt install -y \
+        build-essential \
+        cmake \
+        wget \
+        libboost-program-options-dev \
+        libexpat1 \
+        libexpat-dev \
+        libosmium2-dev \
+        libpqxx-dev \
+        zlib1g-dev \
+ && cd /usr/local/src \
+ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \
+ && tar xvf v${OSM2PGROUTING_VERSION}.tar.gz \
+ && cd osm2pgrouting-${OSM2PGROUTING_VERSION} \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+ && cd ../tools/osmium/ \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+ && cd /usr/local/src \
+ && rm -rf ./* \
+ && apt purge -y \
+        build-essential \
+        cmake \
+        wget \
+        libexpat-dev \
+        libosmium2-dev \
+        libpqxx-dev \
+        zlib1g-dev \
+ && apt install -y \
+        libpqxx-4.0v5 \
+ && apt autoremove -y \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/2.6.1/pg11/resources/compile.sh b/2.6.1/pg11/resources/compile.sh