diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f9a331..e4a17e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,19 +18,8 @@ jobs: fail-fast: false matrix: postgres: [14, 15, 16, 17, 18] - postgis: [3.5, 3.6] + postgis: [3.6] pgrouting: ['3.7', '3.8', '4.0', 'main', 'develop'] - exclude: - - postgres: 18 - postgis: 3.5 - - postgres: 17 - postgis: 3.6 - - postgres: 16 - postgis: 3.6 - - postgres: 15 - postgis: 3.6 - - postgres: 14 - postgis: 3.6 name: Build Docker image for ${{ matrix.postgres }}-${{ matrix.postgis }}-${{ matrix.pgrouting }} runs-on: ubuntu-24.04 diff --git a/14-3.5-3.7/version.txt b/14-3.5-3.7/version.txt deleted file mode 100644 index ca70288..0000000 --- a/14-3.5-3.7/version.txt +++ /dev/null @@ -1 +0,0 @@ -14-3.5-3.7.3 diff --git a/14-3.5-3.8/version.txt b/14-3.5-3.8/version.txt deleted file mode 100644 index 56c08d7..0000000 --- a/14-3.5-3.8/version.txt +++ /dev/null @@ -1 +0,0 @@ -14-3.5-3.8.0 diff --git a/14-3.5-4.0/version.txt b/14-3.5-4.0/version.txt deleted file mode 100644 index fab45a0..0000000 --- a/14-3.5-4.0/version.txt +++ /dev/null @@ -1 +0,0 @@ -14-3.5-4.0.1 diff --git a/14-3.5-develop/version.txt b/14-3.5-develop/version.txt deleted file mode 100644 index a9dee86..0000000 --- a/14-3.5-develop/version.txt +++ /dev/null @@ -1 +0,0 @@ -14-3.5-develop diff --git a/14-3.5-main/extra/Dockerfile b/14-3.5-main/extra/Dockerfile deleted file mode 100644 index ac69978..0000000 --- a/14-3.5-main/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:14-3.5-main - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/14-3.5-main/version.txt b/14-3.5-main/version.txt deleted file mode 100644 index abbcbb3..0000000 --- a/14-3.5-main/version.txt +++ /dev/null @@ -1 +0,0 @@ -14-3.5-main diff --git a/14-3.5-3.7/Dockerfile b/14-3.6-3.7/Dockerfile similarity index 82% rename from 14-3.5-3.7/Dockerfile rename to 14-3.6-3.7/Dockerfile index 2d2fb8e..de39d9a 100644 --- a/14-3.5-3.7/Dockerfile +++ b/14-3.6-3.7/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:14-3.5 +FROM postgis/postgis:14-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=949ebe7acd60565a5a1c206d8918caa371f836015f6a721bdc29482ca23 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/14-3.5-3.7/README.md b/14-3.6-3.7/README.md similarity index 60% rename from 14-3.5-3.7/README.md rename to 14-3.6-3.7/README.md index f1cc52d..c9273e5 100644 --- a/14-3.5-3.7/README.md +++ b/14-3.6-3.7/README.md @@ -1,3 +1,3 @@ # pgRouting 3.7.3 (pg14) -pgRouting Docker image (version 3.7.3) built over [Postgres 14/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.7.3) built over [Postgres 14/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/14-3.5-3.8/docker-compose.yml b/14-3.6-3.7/docker-compose.yml similarity index 80% rename from 14-3.5-3.8/docker-compose.yml rename to 14-3.6-3.7/docker-compose.yml index a40d9a7..baf7db4 100644 --- a/14-3.5-3.8/docker-compose.yml +++ b/14-3.6-3.7/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:14-3.5-3.8.0 + image: pgrouting/pgrouting:14-3.6-3.7.3 ports: - "5432:5432" volumes: diff --git a/14-3.6-3.7/extra/Dockerfile b/14-3.6-3.7/extra/Dockerfile new file mode 100644 index 0000000..73174cf --- /dev/null +++ b/14-3.6-3.7/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:14-3.6-3.7.3 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/14-3.6-3.7/version.txt b/14-3.6-3.7/version.txt new file mode 100644 index 0000000..396f86e --- /dev/null +++ b/14-3.6-3.7/version.txt @@ -0,0 +1 @@ +14-3.6-3.7.3 diff --git a/14-3.5-3.8/Dockerfile b/14-3.6-3.8/Dockerfile similarity index 82% rename from 14-3.5-3.8/Dockerfile rename to 14-3.6-3.8/Dockerfile index 4d2099c..e84292f 100644 --- a/14-3.5-3.8/Dockerfile +++ b/14-3.6-3.8/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:14-3.5 +FROM postgis/postgis:14-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=b8a5f0472934fdf7cda3fb4754d01945378d920cdaddc01f378617ddbb9 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/14-3.5-3.8/README.md b/14-3.6-3.8/README.md similarity index 60% rename from 14-3.5-3.8/README.md rename to 14-3.6-3.8/README.md index aca8b86..4550ef0 100644 --- a/14-3.5-3.8/README.md +++ b/14-3.6-3.8/README.md @@ -1,3 +1,3 @@ # pgRouting 3.8.0 (pg14) -pgRouting Docker image (version 3.8.0) built over [Postgres 14/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.8.0) built over [Postgres 14/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/14-3.5-4.0/docker-compose.yml b/14-3.6-3.8/docker-compose.yml similarity index 80% rename from 14-3.5-4.0/docker-compose.yml rename to 14-3.6-3.8/docker-compose.yml index b791276..c88ac8b 100644 --- a/14-3.5-4.0/docker-compose.yml +++ b/14-3.6-3.8/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:14-3.5-4.0.1 + image: pgrouting/pgrouting:14-3.6-3.8.0 ports: - "5432:5432" volumes: diff --git a/14-3.6-3.8/extra/Dockerfile b/14-3.6-3.8/extra/Dockerfile new file mode 100644 index 0000000..84d78dd --- /dev/null +++ b/14-3.6-3.8/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:14-3.6-3.8.0 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/14-3.6-3.8/version.txt b/14-3.6-3.8/version.txt new file mode 100644 index 0000000..2b017a2 --- /dev/null +++ b/14-3.6-3.8/version.txt @@ -0,0 +1 @@ +14-3.6-3.8.0 diff --git a/14-3.5-4.0/Dockerfile b/14-3.6-4.0/Dockerfile similarity index 82% rename from 14-3.5-4.0/Dockerfile rename to 14-3.6-4.0/Dockerfile index 2d3b2b4..9ddee57 100644 --- a/14-3.5-4.0/Dockerfile +++ b/14-3.6-4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:14-3.5 +FROM postgis/postgis:14-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=21c071983a682e048da28f0f211205a20f27ef3708c0b637b4e6e29994d RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/14-3.5-4.0/README.md b/14-3.6-4.0/README.md similarity index 60% rename from 14-3.5-4.0/README.md rename to 14-3.6-4.0/README.md index ccd7acd..6597e4a 100644 --- a/14-3.5-4.0/README.md +++ b/14-3.6-4.0/README.md @@ -1,3 +1,3 @@ # pgRouting 4.0.1 (pg14) -pgRouting Docker image (version 4.0.1) built over [Postgres 14/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 4.0.1) built over [Postgres 14/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/14-3.5-3.7/docker-compose.yml b/14-3.6-4.0/docker-compose.yml similarity index 80% rename from 14-3.5-3.7/docker-compose.yml rename to 14-3.6-4.0/docker-compose.yml index 14a9d66..5a75767 100644 --- a/14-3.5-3.7/docker-compose.yml +++ b/14-3.6-4.0/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:14-3.5-3.7.3 + image: pgrouting/pgrouting:14-3.6-4.0.1 ports: - "5432:5432" volumes: diff --git a/14-3.6-4.0/extra/Dockerfile b/14-3.6-4.0/extra/Dockerfile new file mode 100644 index 0000000..cd459ae --- /dev/null +++ b/14-3.6-4.0/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:14-3.6-4.0.1 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/14-3.6-4.0/version.txt b/14-3.6-4.0/version.txt new file mode 100644 index 0000000..da8853f --- /dev/null +++ b/14-3.6-4.0/version.txt @@ -0,0 +1 @@ +14-3.6-4.0.1 diff --git a/16-3.5-develop/Dockerfile b/14-3.6-develop/Dockerfile similarity index 78% rename from 16-3.5-develop/Dockerfile rename to 14-3.6-develop/Dockerfile index f00eb9a..a220311 100644 --- a/16-3.5-develop/Dockerfile +++ b/14-3.6-develop/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:16-3.5 +FROM postgis/postgis:14-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=37797554f52613def04528ad22bf4234d5e2e476 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/14-3.5-develop/README.md b/14-3.6-develop/README.md similarity index 61% rename from 14-3.5-develop/README.md rename to 14-3.6-develop/README.md index 7e65a77..aad6e91 100644 --- a/14-3.5-develop/README.md +++ b/14-3.6-develop/README.md @@ -1,3 +1,3 @@ # pgRouting develop (pg14) -pgRouting Docker image (version develop) built over [Postgres 14/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version develop) built over [Postgres 14/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/14-3.5-develop/docker-compose.yml b/14-3.6-develop/docker-compose.yml similarity index 79% rename from 14-3.5-develop/docker-compose.yml rename to 14-3.6-develop/docker-compose.yml index e9fde7f..b2a7cf6 100644 --- a/14-3.5-develop/docker-compose.yml +++ b/14-3.6-develop/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:14-3.5-develop + image: pgrouting/pgrouting:14-3.6-develop ports: - "5432:5432" volumes: diff --git a/14-3.6-develop/extra/Dockerfile b/14-3.6-develop/extra/Dockerfile new file mode 100644 index 0000000..a2e8abf --- /dev/null +++ b/14-3.6-develop/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:14-3.6-develop + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/14-3.6-develop/version.txt b/14-3.6-develop/version.txt new file mode 100644 index 0000000..d0e1c75 --- /dev/null +++ b/14-3.6-develop/version.txt @@ -0,0 +1 @@ +14-3.6-develop diff --git a/14-3.5-main/Dockerfile b/14-3.6-main/Dockerfile similarity index 78% rename from 14-3.5-main/Dockerfile rename to 14-3.6-main/Dockerfile index 44e03dc..c3eb5ee 100644 --- a/14-3.5-main/Dockerfile +++ b/14-3.6-main/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:14-3.5 +FROM postgis/postgis:14-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=8988eebdff0e01327c9d48fe7c80b437dc9bc992 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/14-3.5-main/README.md b/14-3.6-main/README.md similarity index 60% rename from 14-3.5-main/README.md rename to 14-3.6-main/README.md index 3fa3ac5..93c4bcd 100644 --- a/14-3.5-main/README.md +++ b/14-3.6-main/README.md @@ -1,3 +1,3 @@ # pgRouting main (pg14) -pgRouting Docker image (version main) built over [Postgres 14/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version main) built over [Postgres 14/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/15-3.5-main/docker-compose.yml b/14-3.6-main/docker-compose.yml similarity index 80% rename from 15-3.5-main/docker-compose.yml rename to 14-3.6-main/docker-compose.yml index 871e249..4524d70 100644 --- a/15-3.5-main/docker-compose.yml +++ b/14-3.6-main/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:15-3.5-main + image: pgrouting/pgrouting:14-3.6-main ports: - "5432:5432" volumes: diff --git a/14-3.5-4.0/extra/Dockerfile b/14-3.6-main/extra/Dockerfile similarity index 81% rename from 14-3.5-4.0/extra/Dockerfile rename to 14-3.6-main/extra/Dockerfile index 4718bcc..5f125dc 100644 --- a/14-3.5-4.0/extra/Dockerfile +++ b/14-3.6-main/extra/Dockerfile @@ -1,10 +1,10 @@ -FROM pgrouting/pgrouting:14-3.5-4.0.1 +FROM pgrouting/pgrouting:14-3.6-main ENV OSM2PGROUTING_VERSION=3.0.0 RUN apt update \ && apt install -y \ - libpqxx-6.4 \ + libpqxx-7.10 \ && apt install -y \ build-essential \ cmake \ @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ @@ -24,12 +24,12 @@ RUN apt update \ && cmake .. \ && make \ && make install \ - && cd ../tools/osmium/ \ - && 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 --autoremove \ diff --git a/14-3.6-main/version.txt b/14-3.6-main/version.txt new file mode 100644 index 0000000..5e270d2 --- /dev/null +++ b/14-3.6-main/version.txt @@ -0,0 +1 @@ +14-3.6-main diff --git a/15-3.5-3.7/docker-compose.yml b/15-3.5-3.7/docker-compose.yml deleted file mode 100644 index aff6ffc..0000000 --- a/15-3.5-3.7/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:15-3.5-3.7.3 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/15-3.5-3.7/extra/Dockerfile b/15-3.5-3.7/extra/Dockerfile deleted file mode 100644 index 0b81186..0000000 --- a/15-3.5-3.7/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:15-3.5-3.7.3 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/15-3.5-3.7/version.txt b/15-3.5-3.7/version.txt deleted file mode 100644 index cd04b62..0000000 --- a/15-3.5-3.7/version.txt +++ /dev/null @@ -1 +0,0 @@ -15-3.5-3.7.3 diff --git a/15-3.5-3.8/docker-compose.yml b/15-3.5-3.8/docker-compose.yml deleted file mode 100644 index 57827b4..0000000 --- a/15-3.5-3.8/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:15-3.5-3.8.0 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/15-3.5-3.8/extra/Dockerfile b/15-3.5-3.8/extra/Dockerfile deleted file mode 100644 index dd27c70..0000000 --- a/15-3.5-3.8/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:15-3.5-3.8.0 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/15-3.5-3.8/version.txt b/15-3.5-3.8/version.txt deleted file mode 100644 index fb58a30..0000000 --- a/15-3.5-3.8/version.txt +++ /dev/null @@ -1 +0,0 @@ -15-3.5-3.8.0 diff --git a/15-3.5-4.0/docker-compose.yml b/15-3.5-4.0/docker-compose.yml deleted file mode 100644 index e7c8e07..0000000 --- a/15-3.5-4.0/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:15-3.5-4.0.1 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/15-3.5-4.0/extra/Dockerfile b/15-3.5-4.0/extra/Dockerfile deleted file mode 100644 index f748550..0000000 --- a/15-3.5-4.0/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:15-3.5-4.0.1 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/15-3.5-4.0/version.txt b/15-3.5-4.0/version.txt deleted file mode 100644 index 67d2e28..0000000 --- a/15-3.5-4.0/version.txt +++ /dev/null @@ -1 +0,0 @@ -15-3.5-4.0.1 diff --git a/15-3.5-develop/docker-compose.yml b/15-3.5-develop/docker-compose.yml deleted file mode 100644 index 650fa45..0000000 --- a/15-3.5-develop/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:15-3.5-develop - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/15-3.5-develop/extra/Dockerfile b/15-3.5-develop/extra/Dockerfile deleted file mode 100644 index 59ccaa0..0000000 --- a/15-3.5-develop/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:15-3.5-develop - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/15-3.5-develop/version.txt b/15-3.5-develop/version.txt deleted file mode 100644 index c101fae..0000000 --- a/15-3.5-develop/version.txt +++ /dev/null @@ -1 +0,0 @@ -15-3.5-develop diff --git a/15-3.5-main/extra/Dockerfile b/15-3.5-main/extra/Dockerfile deleted file mode 100644 index ecae035..0000000 --- a/15-3.5-main/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:15-3.5-main - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/15-3.5-main/version.txt b/15-3.5-main/version.txt deleted file mode 100644 index ac3daab..0000000 --- a/15-3.5-main/version.txt +++ /dev/null @@ -1 +0,0 @@ -15-3.5-main diff --git a/15-3.5-3.7/Dockerfile b/15-3.6-3.7/Dockerfile similarity index 82% rename from 15-3.5-3.7/Dockerfile rename to 15-3.6-3.7/Dockerfile index 0ea3dc0..c79cdcb 100644 --- a/15-3.5-3.7/Dockerfile +++ b/15-3.6-3.7/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:15-3.5 +FROM postgis/postgis:15-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=949ebe7acd60565a5a1c206d8918caa371f836015f6a721bdc29482ca23 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/15-3.5-3.7/README.md b/15-3.6-3.7/README.md similarity index 60% rename from 15-3.5-3.7/README.md rename to 15-3.6-3.7/README.md index 4a8678a..7c34084 100644 --- a/15-3.5-3.7/README.md +++ b/15-3.6-3.7/README.md @@ -1,3 +1,3 @@ # pgRouting 3.7.3 (pg15) -pgRouting Docker image (version 3.7.3) built over [Postgres 15/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.7.3) built over [Postgres 15/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/15-3.6-3.7/docker-compose.yml b/15-3.6-3.7/docker-compose.yml new file mode 100644 index 0000000..9407dc8 --- /dev/null +++ b/15-3.6-3.7/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:15-3.6-3.7.3 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/15-3.6-3.7/extra/Dockerfile b/15-3.6-3.7/extra/Dockerfile new file mode 100644 index 0000000..0528d45 --- /dev/null +++ b/15-3.6-3.7/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:15-3.6-3.7.3 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/15-3.6-3.7/version.txt b/15-3.6-3.7/version.txt new file mode 100644 index 0000000..066bd81 --- /dev/null +++ b/15-3.6-3.7/version.txt @@ -0,0 +1 @@ +15-3.6-3.7.3 diff --git a/15-3.5-3.8/Dockerfile b/15-3.6-3.8/Dockerfile similarity index 82% rename from 15-3.5-3.8/Dockerfile rename to 15-3.6-3.8/Dockerfile index bbe3cda..c59b106 100644 --- a/15-3.5-3.8/Dockerfile +++ b/15-3.6-3.8/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:15-3.5 +FROM postgis/postgis:15-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=b8a5f0472934fdf7cda3fb4754d01945378d920cdaddc01f378617ddbb9 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/15-3.5-3.8/README.md b/15-3.6-3.8/README.md similarity index 60% rename from 15-3.5-3.8/README.md rename to 15-3.6-3.8/README.md index 04ae159..32a5d20 100644 --- a/15-3.5-3.8/README.md +++ b/15-3.6-3.8/README.md @@ -1,3 +1,3 @@ # pgRouting 3.8.0 (pg15) -pgRouting Docker image (version 3.8.0) built over [Postgres 15/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.8.0) built over [Postgres 15/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/15-3.6-3.8/docker-compose.yml b/15-3.6-3.8/docker-compose.yml new file mode 100644 index 0000000..4956f1c --- /dev/null +++ b/15-3.6-3.8/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:15-3.6-3.8.0 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/15-3.6-3.8/extra/Dockerfile b/15-3.6-3.8/extra/Dockerfile new file mode 100644 index 0000000..50ddbda --- /dev/null +++ b/15-3.6-3.8/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:15-3.6-3.8.0 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/15-3.6-3.8/version.txt b/15-3.6-3.8/version.txt new file mode 100644 index 0000000..7accd18 --- /dev/null +++ b/15-3.6-3.8/version.txt @@ -0,0 +1 @@ +15-3.6-3.8.0 diff --git a/15-3.5-4.0/Dockerfile b/15-3.6-4.0/Dockerfile similarity index 82% rename from 15-3.5-4.0/Dockerfile rename to 15-3.6-4.0/Dockerfile index a92acd9..a9cce83 100644 --- a/15-3.5-4.0/Dockerfile +++ b/15-3.6-4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:15-3.5 +FROM postgis/postgis:15-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=21c071983a682e048da28f0f211205a20f27ef3708c0b637b4e6e29994d RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/15-3.5-4.0/README.md b/15-3.6-4.0/README.md similarity index 60% rename from 15-3.5-4.0/README.md rename to 15-3.6-4.0/README.md index e7c3ca0..aec0120 100644 --- a/15-3.5-4.0/README.md +++ b/15-3.6-4.0/README.md @@ -1,3 +1,3 @@ # pgRouting 4.0.1 (pg15) -pgRouting Docker image (version 4.0.1) built over [Postgres 15/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 4.0.1) built over [Postgres 15/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/15-3.6-4.0/docker-compose.yml b/15-3.6-4.0/docker-compose.yml new file mode 100644 index 0000000..6282a9a --- /dev/null +++ b/15-3.6-4.0/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:15-3.6-4.0.1 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/15-3.6-4.0/extra/Dockerfile b/15-3.6-4.0/extra/Dockerfile new file mode 100644 index 0000000..afe23ac --- /dev/null +++ b/15-3.6-4.0/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:15-3.6-4.0.1 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/15-3.6-4.0/version.txt b/15-3.6-4.0/version.txt new file mode 100644 index 0000000..7b3db9e --- /dev/null +++ b/15-3.6-4.0/version.txt @@ -0,0 +1 @@ +15-3.6-4.0.1 diff --git a/15-3.5-develop/Dockerfile b/15-3.6-develop/Dockerfile similarity index 78% rename from 15-3.5-develop/Dockerfile rename to 15-3.6-develop/Dockerfile index a0ef810..6f4a0a6 100644 --- a/15-3.5-develop/Dockerfile +++ b/15-3.6-develop/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:15-3.5 +FROM postgis/postgis:15-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=37797554f52613def04528ad22bf4234d5e2e476 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/15-3.5-develop/README.md b/15-3.6-develop/README.md similarity index 61% rename from 15-3.5-develop/README.md rename to 15-3.6-develop/README.md index 4d29bbb..7f29830 100644 --- a/15-3.5-develop/README.md +++ b/15-3.6-develop/README.md @@ -1,3 +1,3 @@ # pgRouting develop (pg15) -pgRouting Docker image (version develop) built over [Postgres 15/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version develop) built over [Postgres 15/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/15-3.6-develop/docker-compose.yml b/15-3.6-develop/docker-compose.yml new file mode 100644 index 0000000..7b9b984 --- /dev/null +++ b/15-3.6-develop/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:15-3.6-develop + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/15-3.6-develop/extra/Dockerfile b/15-3.6-develop/extra/Dockerfile new file mode 100644 index 0000000..f4f387c --- /dev/null +++ b/15-3.6-develop/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:15-3.6-develop + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/15-3.6-develop/version.txt b/15-3.6-develop/version.txt new file mode 100644 index 0000000..a07803c --- /dev/null +++ b/15-3.6-develop/version.txt @@ -0,0 +1 @@ +15-3.6-develop diff --git a/16-3.5-main/Dockerfile b/15-3.6-main/Dockerfile similarity index 78% rename from 16-3.5-main/Dockerfile rename to 15-3.6-main/Dockerfile index af1c32c..a113052 100644 --- a/16-3.5-main/Dockerfile +++ b/15-3.6-main/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:16-3.5 +FROM postgis/postgis:15-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=8988eebdff0e01327c9d48fe7c80b437dc9bc992 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/15-3.5-main/README.md b/15-3.6-main/README.md similarity index 60% rename from 15-3.5-main/README.md rename to 15-3.6-main/README.md index a4381f2..a15a468 100644 --- a/15-3.5-main/README.md +++ b/15-3.6-main/README.md @@ -1,3 +1,3 @@ # pgRouting main (pg15) -pgRouting Docker image (version main) built over [Postgres 15/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version main) built over [Postgres 15/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/16-3.5-main/docker-compose.yml b/15-3.6-main/docker-compose.yml similarity index 80% rename from 16-3.5-main/docker-compose.yml rename to 15-3.6-main/docker-compose.yml index 7e06b94..808ff93 100644 --- a/16-3.5-main/docker-compose.yml +++ b/15-3.6-main/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:16-3.5-main + image: pgrouting/pgrouting:15-3.6-main ports: - "5432:5432" volumes: diff --git a/14-3.5-develop/extra/Dockerfile b/15-3.6-main/extra/Dockerfile similarity index 81% rename from 14-3.5-develop/extra/Dockerfile rename to 15-3.6-main/extra/Dockerfile index e1de536..fd37dd3 100644 --- a/14-3.5-develop/extra/Dockerfile +++ b/15-3.6-main/extra/Dockerfile @@ -1,10 +1,10 @@ -FROM pgrouting/pgrouting:14-3.5-develop +FROM pgrouting/pgrouting:15-3.6-main ENV OSM2PGROUTING_VERSION=3.0.0 RUN apt update \ && apt install -y \ - libpqxx-6.4 \ + libpqxx-7.10 \ && apt install -y \ build-essential \ cmake \ @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ @@ -24,12 +24,12 @@ RUN apt update \ && cmake .. \ && make \ && make install \ - && cd ../tools/osmium/ \ - && 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 --autoremove \ diff --git a/15-3.6-main/version.txt b/15-3.6-main/version.txt new file mode 100644 index 0000000..0e8af23 --- /dev/null +++ b/15-3.6-main/version.txt @@ -0,0 +1 @@ +15-3.6-main diff --git a/16-3.5-3.7/docker-compose.yml b/16-3.5-3.7/docker-compose.yml deleted file mode 100644 index 96e7062..0000000 --- a/16-3.5-3.7/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:16-3.5-3.7.3 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/16-3.5-3.7/extra/Dockerfile b/16-3.5-3.7/extra/Dockerfile deleted file mode 100644 index 29ee77c..0000000 --- a/16-3.5-3.7/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:16-3.5-3.7.3 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/16-3.5-3.7/version.txt b/16-3.5-3.7/version.txt deleted file mode 100644 index be752c4..0000000 --- a/16-3.5-3.7/version.txt +++ /dev/null @@ -1 +0,0 @@ -16-3.5-3.7.3 diff --git a/16-3.5-3.8/docker-compose.yml b/16-3.5-3.8/docker-compose.yml deleted file mode 100644 index a8d28f3..0000000 --- a/16-3.5-3.8/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:16-3.5-3.8.0 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/16-3.5-3.8/extra/Dockerfile b/16-3.5-3.8/extra/Dockerfile deleted file mode 100644 index a0235a7..0000000 --- a/16-3.5-3.8/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:16-3.5-3.8.0 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/16-3.5-3.8/version.txt b/16-3.5-3.8/version.txt deleted file mode 100644 index 0f9d63f..0000000 --- a/16-3.5-3.8/version.txt +++ /dev/null @@ -1 +0,0 @@ -16-3.5-3.8.0 diff --git a/16-3.5-4.0/docker-compose.yml b/16-3.5-4.0/docker-compose.yml deleted file mode 100644 index 6301134..0000000 --- a/16-3.5-4.0/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:16-3.5-4.0.1 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/16-3.5-4.0/extra/Dockerfile b/16-3.5-4.0/extra/Dockerfile deleted file mode 100644 index 0d70992..0000000 --- a/16-3.5-4.0/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:16-3.5-4.0.1 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/16-3.5-4.0/version.txt b/16-3.5-4.0/version.txt deleted file mode 100644 index c8157d4..0000000 --- a/16-3.5-4.0/version.txt +++ /dev/null @@ -1 +0,0 @@ -16-3.5-4.0.1 diff --git a/16-3.5-develop/docker-compose.yml b/16-3.5-develop/docker-compose.yml deleted file mode 100644 index 3a6cb4c..0000000 --- a/16-3.5-develop/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:16-3.5-develop - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/16-3.5-develop/extra/Dockerfile b/16-3.5-develop/extra/Dockerfile deleted file mode 100644 index 6b3b7bd..0000000 --- a/16-3.5-develop/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:16-3.5-develop - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/16-3.5-develop/version.txt b/16-3.5-develop/version.txt deleted file mode 100644 index cc3f39b..0000000 --- a/16-3.5-develop/version.txt +++ /dev/null @@ -1 +0,0 @@ -16-3.5-develop diff --git a/16-3.5-main/extra/Dockerfile b/16-3.5-main/extra/Dockerfile deleted file mode 100644 index 1d2fa0f..0000000 --- a/16-3.5-main/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:16-3.5-main - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/16-3.5-main/version.txt b/16-3.5-main/version.txt deleted file mode 100644 index 74deccf..0000000 --- a/16-3.5-main/version.txt +++ /dev/null @@ -1 +0,0 @@ -16-3.5-main diff --git a/16-3.5-3.7/Dockerfile b/16-3.6-3.7/Dockerfile similarity index 82% rename from 16-3.5-3.7/Dockerfile rename to 16-3.6-3.7/Dockerfile index 1ef1d15..0de1442 100644 --- a/16-3.5-3.7/Dockerfile +++ b/16-3.6-3.7/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:16-3.5 +FROM postgis/postgis:16-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=949ebe7acd60565a5a1c206d8918caa371f836015f6a721bdc29482ca23 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/16-3.5-3.7/README.md b/16-3.6-3.7/README.md similarity index 60% rename from 16-3.5-3.7/README.md rename to 16-3.6-3.7/README.md index 6b0c0e7..2410c5a 100644 --- a/16-3.5-3.7/README.md +++ b/16-3.6-3.7/README.md @@ -1,3 +1,3 @@ # pgRouting 3.7.3 (pg16) -pgRouting Docker image (version 3.7.3) built over [Postgres 16/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.7.3) built over [Postgres 16/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/16-3.6-3.7/docker-compose.yml b/16-3.6-3.7/docker-compose.yml new file mode 100644 index 0000000..21be567 --- /dev/null +++ b/16-3.6-3.7/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:16-3.6-3.7.3 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/16-3.6-3.7/extra/Dockerfile b/16-3.6-3.7/extra/Dockerfile new file mode 100644 index 0000000..4c91ae2 --- /dev/null +++ b/16-3.6-3.7/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:16-3.6-3.7.3 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/16-3.6-3.7/version.txt b/16-3.6-3.7/version.txt new file mode 100644 index 0000000..58b3d97 --- /dev/null +++ b/16-3.6-3.7/version.txt @@ -0,0 +1 @@ +16-3.6-3.7.3 diff --git a/16-3.5-3.8/Dockerfile b/16-3.6-3.8/Dockerfile similarity index 82% rename from 16-3.5-3.8/Dockerfile rename to 16-3.6-3.8/Dockerfile index 7814c12..5bf360f 100644 --- a/16-3.5-3.8/Dockerfile +++ b/16-3.6-3.8/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:16-3.5 +FROM postgis/postgis:16-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=b8a5f0472934fdf7cda3fb4754d01945378d920cdaddc01f378617ddbb9 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/16-3.5-3.8/README.md b/16-3.6-3.8/README.md similarity index 60% rename from 16-3.5-3.8/README.md rename to 16-3.6-3.8/README.md index b3b90e0..4346657 100644 --- a/16-3.5-3.8/README.md +++ b/16-3.6-3.8/README.md @@ -1,3 +1,3 @@ # pgRouting 3.8.0 (pg16) -pgRouting Docker image (version 3.8.0) built over [Postgres 16/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.8.0) built over [Postgres 16/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/16-3.6-3.8/docker-compose.yml b/16-3.6-3.8/docker-compose.yml new file mode 100644 index 0000000..0cefa28 --- /dev/null +++ b/16-3.6-3.8/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:16-3.6-3.8.0 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/16-3.6-3.8/extra/Dockerfile b/16-3.6-3.8/extra/Dockerfile new file mode 100644 index 0000000..468e3f6 --- /dev/null +++ b/16-3.6-3.8/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:16-3.6-3.8.0 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/16-3.6-3.8/version.txt b/16-3.6-3.8/version.txt new file mode 100644 index 0000000..2d11d5c --- /dev/null +++ b/16-3.6-3.8/version.txt @@ -0,0 +1 @@ +16-3.6-3.8.0 diff --git a/16-3.5-4.0/Dockerfile b/16-3.6-4.0/Dockerfile similarity index 82% rename from 16-3.5-4.0/Dockerfile rename to 16-3.6-4.0/Dockerfile index 95dedf2..2047eee 100644 --- a/16-3.5-4.0/Dockerfile +++ b/16-3.6-4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:16-3.5 +FROM postgis/postgis:16-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=21c071983a682e048da28f0f211205a20f27ef3708c0b637b4e6e29994d RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/16-3.5-4.0/README.md b/16-3.6-4.0/README.md similarity index 60% rename from 16-3.5-4.0/README.md rename to 16-3.6-4.0/README.md index 8d0cb9f..2a41cd9 100644 --- a/16-3.5-4.0/README.md +++ b/16-3.6-4.0/README.md @@ -1,3 +1,3 @@ # pgRouting 4.0.1 (pg16) -pgRouting Docker image (version 4.0.1) built over [Postgres 16/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 4.0.1) built over [Postgres 16/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/16-3.6-4.0/docker-compose.yml b/16-3.6-4.0/docker-compose.yml new file mode 100644 index 0000000..5341ef5 --- /dev/null +++ b/16-3.6-4.0/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:16-3.6-4.0.1 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/16-3.6-4.0/extra/Dockerfile b/16-3.6-4.0/extra/Dockerfile new file mode 100644 index 0000000..158b3ee --- /dev/null +++ b/16-3.6-4.0/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:16-3.6-4.0.1 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/16-3.6-4.0/version.txt b/16-3.6-4.0/version.txt new file mode 100644 index 0000000..5a5ccc8 --- /dev/null +++ b/16-3.6-4.0/version.txt @@ -0,0 +1 @@ +16-3.6-4.0.1 diff --git a/17-3.5-develop/Dockerfile b/16-3.6-develop/Dockerfile similarity index 78% rename from 17-3.5-develop/Dockerfile rename to 16-3.6-develop/Dockerfile index 9a14884..d648c2e 100644 --- a/17-3.5-develop/Dockerfile +++ b/16-3.6-develop/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:17-3.5 +FROM postgis/postgis:16-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=37797554f52613def04528ad22bf4234d5e2e476 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/16-3.5-develop/README.md b/16-3.6-develop/README.md similarity index 61% rename from 16-3.5-develop/README.md rename to 16-3.6-develop/README.md index 72dd42b..21b3102 100644 --- a/16-3.5-develop/README.md +++ b/16-3.6-develop/README.md @@ -1,3 +1,3 @@ # pgRouting develop (pg16) -pgRouting Docker image (version develop) built over [Postgres 16/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version develop) built over [Postgres 16/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/16-3.6-develop/docker-compose.yml b/16-3.6-develop/docker-compose.yml new file mode 100644 index 0000000..58c87f3 --- /dev/null +++ b/16-3.6-develop/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:16-3.6-develop + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/16-3.6-develop/extra/Dockerfile b/16-3.6-develop/extra/Dockerfile new file mode 100644 index 0000000..16e1065 --- /dev/null +++ b/16-3.6-develop/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:16-3.6-develop + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/16-3.6-develop/version.txt b/16-3.6-develop/version.txt new file mode 100644 index 0000000..0f20c2b --- /dev/null +++ b/16-3.6-develop/version.txt @@ -0,0 +1 @@ +16-3.6-develop diff --git a/15-3.5-main/Dockerfile b/16-3.6-main/Dockerfile similarity index 78% rename from 15-3.5-main/Dockerfile rename to 16-3.6-main/Dockerfile index 8e919ca..3ce18b4 100644 --- a/15-3.5-main/Dockerfile +++ b/16-3.6-main/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:15-3.5 +FROM postgis/postgis:16-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=8988eebdff0e01327c9d48fe7c80b437dc9bc992 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/16-3.5-main/README.md b/16-3.6-main/README.md similarity index 60% rename from 16-3.5-main/README.md rename to 16-3.6-main/README.md index a0ac15a..c604e97 100644 --- a/16-3.5-main/README.md +++ b/16-3.6-main/README.md @@ -1,3 +1,3 @@ # pgRouting main (pg16) -pgRouting Docker image (version main) built over [Postgres 16/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version main) built over [Postgres 16/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/17-3.5-main/docker-compose.yml b/16-3.6-main/docker-compose.yml similarity index 80% rename from 17-3.5-main/docker-compose.yml rename to 16-3.6-main/docker-compose.yml index 4d99e28..44d3db1 100644 --- a/17-3.5-main/docker-compose.yml +++ b/16-3.6-main/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:17-3.5-main + image: pgrouting/pgrouting:16-3.6-main ports: - "5432:5432" volumes: diff --git a/14-3.5-3.8/extra/Dockerfile b/16-3.6-main/extra/Dockerfile similarity index 81% rename from 14-3.5-3.8/extra/Dockerfile rename to 16-3.6-main/extra/Dockerfile index 3ff267d..24773ad 100644 --- a/14-3.5-3.8/extra/Dockerfile +++ b/16-3.6-main/extra/Dockerfile @@ -1,10 +1,10 @@ -FROM pgrouting/pgrouting:14-3.5-3.8.0 +FROM pgrouting/pgrouting:16-3.6-main ENV OSM2PGROUTING_VERSION=3.0.0 RUN apt update \ && apt install -y \ - libpqxx-6.4 \ + libpqxx-7.10 \ && apt install -y \ build-essential \ cmake \ @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ @@ -24,12 +24,12 @@ RUN apt update \ && cmake .. \ && make \ && make install \ - && cd ../tools/osmium/ \ - && 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 --autoremove \ diff --git a/16-3.6-main/version.txt b/16-3.6-main/version.txt new file mode 100644 index 0000000..0b7cd52 --- /dev/null +++ b/16-3.6-main/version.txt @@ -0,0 +1 @@ +16-3.6-main diff --git a/17-3.5-3.7/docker-compose.yml b/17-3.5-3.7/docker-compose.yml deleted file mode 100644 index 8e6dc43..0000000 --- a/17-3.5-3.7/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:17-3.5-3.7.3 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/17-3.5-3.7/extra/Dockerfile b/17-3.5-3.7/extra/Dockerfile deleted file mode 100644 index 965a8e6..0000000 --- a/17-3.5-3.7/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:17-3.5-3.7.3 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/17-3.5-3.7/version.txt b/17-3.5-3.7/version.txt deleted file mode 100644 index a59ef80..0000000 --- a/17-3.5-3.7/version.txt +++ /dev/null @@ -1 +0,0 @@ -17-3.5-3.7.3 diff --git a/17-3.5-3.8/docker-compose.yml b/17-3.5-3.8/docker-compose.yml deleted file mode 100644 index 70ff986..0000000 --- a/17-3.5-3.8/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:17-3.5-3.8.0 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/17-3.5-3.8/extra/Dockerfile b/17-3.5-3.8/extra/Dockerfile deleted file mode 100644 index e6ac8fb..0000000 --- a/17-3.5-3.8/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:17-3.5-3.8.0 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/17-3.5-3.8/version.txt b/17-3.5-3.8/version.txt deleted file mode 100644 index 0ea105b..0000000 --- a/17-3.5-3.8/version.txt +++ /dev/null @@ -1 +0,0 @@ -17-3.5-3.8.0 diff --git a/17-3.5-4.0/docker-compose.yml b/17-3.5-4.0/docker-compose.yml deleted file mode 100644 index de509ee..0000000 --- a/17-3.5-4.0/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:17-3.5-4.0.1 - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/17-3.5-4.0/extra/Dockerfile b/17-3.5-4.0/extra/Dockerfile deleted file mode 100644 index 9b3053c..0000000 --- a/17-3.5-4.0/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:17-3.5-4.0.1 - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/17-3.5-4.0/version.txt b/17-3.5-4.0/version.txt deleted file mode 100644 index 2d0b4c5..0000000 --- a/17-3.5-4.0/version.txt +++ /dev/null @@ -1 +0,0 @@ -17-3.5-4.0.1 diff --git a/17-3.5-develop/docker-compose.yml b/17-3.5-develop/docker-compose.yml deleted file mode 100644 index 94fd2f7..0000000 --- a/17-3.5-develop/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - pgrouting: - image: pgrouting/pgrouting:17-3.5-develop - ports: - - "5432:5432" - volumes: - - db-data:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=postgres -volumes: - db-data: diff --git a/17-3.5-develop/extra/Dockerfile b/17-3.5-develop/extra/Dockerfile deleted file mode 100644 index 5ac8600..0000000 --- a/17-3.5-develop/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:17-3.5-develop - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/17-3.5-develop/version.txt b/17-3.5-develop/version.txt deleted file mode 100644 index f77a464..0000000 --- a/17-3.5-develop/version.txt +++ /dev/null @@ -1 +0,0 @@ -17-3.5-develop diff --git a/17-3.5-main/extra/Dockerfile b/17-3.5-main/extra/Dockerfile deleted file mode 100644 index 3826ad2..0000000 --- a/17-3.5-main/extra/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM pgrouting/pgrouting:17-3.5-main - -ENV OSM2PGROUTING_VERSION=3.0.0 - -RUN apt update \ - && apt install -y \ - libpqxx-6.4 \ - && 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 --autoremove \ - build-essential \ - cmake \ - wget \ - libboost-program-options-dev \ - libexpat-dev \ - libosmium2-dev \ - libpqxx-dev \ - zlib1g-dev \ - && apt autoremove -y \ - && rm -rf /var/lib/apt/lists/* diff --git a/17-3.5-main/version.txt b/17-3.5-main/version.txt deleted file mode 100644 index 9782a47..0000000 --- a/17-3.5-main/version.txt +++ /dev/null @@ -1 +0,0 @@ -17-3.5-main diff --git a/17-3.5-3.7/Dockerfile b/17-3.6-3.7/Dockerfile similarity index 82% rename from 17-3.5-3.7/Dockerfile rename to 17-3.6-3.7/Dockerfile index 1a76e58..c467071 100644 --- a/17-3.5-3.7/Dockerfile +++ b/17-3.6-3.7/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:17-3.5 +FROM postgis/postgis:17-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=949ebe7acd60565a5a1c206d8918caa371f836015f6a721bdc29482ca23 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/17-3.5-3.7/README.md b/17-3.6-3.7/README.md similarity index 60% rename from 17-3.5-3.7/README.md rename to 17-3.6-3.7/README.md index 725e75e..ae7db5c 100644 --- a/17-3.5-3.7/README.md +++ b/17-3.6-3.7/README.md @@ -1,3 +1,3 @@ # pgRouting 3.7.3 (pg17) -pgRouting Docker image (version 3.7.3) built over [Postgres 17/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.7.3) built over [Postgres 17/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/17-3.6-3.7/docker-compose.yml b/17-3.6-3.7/docker-compose.yml new file mode 100644 index 0000000..863f1c6 --- /dev/null +++ b/17-3.6-3.7/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:17-3.6-3.7.3 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/17-3.6-3.7/extra/Dockerfile b/17-3.6-3.7/extra/Dockerfile new file mode 100644 index 0000000..ac9d263 --- /dev/null +++ b/17-3.6-3.7/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:17-3.6-3.7.3 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/17-3.6-3.7/version.txt b/17-3.6-3.7/version.txt new file mode 100644 index 0000000..d47b362 --- /dev/null +++ b/17-3.6-3.7/version.txt @@ -0,0 +1 @@ +17-3.6-3.7.3 diff --git a/17-3.5-3.8/Dockerfile b/17-3.6-3.8/Dockerfile similarity index 82% rename from 17-3.5-3.8/Dockerfile rename to 17-3.6-3.8/Dockerfile index 1a87683..fa0147b 100644 --- a/17-3.5-3.8/Dockerfile +++ b/17-3.6-3.8/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:17-3.5 +FROM postgis/postgis:17-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=b8a5f0472934fdf7cda3fb4754d01945378d920cdaddc01f378617ddbb9 RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/17-3.5-3.8/README.md b/17-3.6-3.8/README.md similarity index 60% rename from 17-3.5-3.8/README.md rename to 17-3.6-3.8/README.md index 912cc6a..2e89c3b 100644 --- a/17-3.5-3.8/README.md +++ b/17-3.6-3.8/README.md @@ -1,3 +1,3 @@ # pgRouting 3.8.0 (pg17) -pgRouting Docker image (version 3.8.0) built over [Postgres 17/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 3.8.0) built over [Postgres 17/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/17-3.6-3.8/docker-compose.yml b/17-3.6-3.8/docker-compose.yml new file mode 100644 index 0000000..b47c0ed --- /dev/null +++ b/17-3.6-3.8/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:17-3.6-3.8.0 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/17-3.6-3.8/extra/Dockerfile b/17-3.6-3.8/extra/Dockerfile new file mode 100644 index 0000000..bd05190 --- /dev/null +++ b/17-3.6-3.8/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:17-3.6-3.8.0 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/17-3.6-3.8/version.txt b/17-3.6-3.8/version.txt new file mode 100644 index 0000000..eb7cdff --- /dev/null +++ b/17-3.6-3.8/version.txt @@ -0,0 +1 @@ +17-3.6-3.8.0 diff --git a/17-3.5-4.0/Dockerfile b/17-3.6-4.0/Dockerfile similarity index 82% rename from 17-3.5-4.0/Dockerfile rename to 17-3.6-4.0/Dockerfile index 9e2e33e..eecd4ab 100644 --- a/17-3.5-4.0/Dockerfile +++ b/17-3.6-4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:17-3.5 +FROM postgis/postgis:17-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -8,13 +8,13 @@ ENV PGROUTING_SHA256=21c071983a682e048da28f0f211205a20f27ef3708c0b637b4e6e29994d RUN set -ex \ && apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/17-3.5-4.0/README.md b/17-3.6-4.0/README.md similarity index 60% rename from 17-3.5-4.0/README.md rename to 17-3.6-4.0/README.md index 7a2ec02..1a71be2 100644 --- a/17-3.5-4.0/README.md +++ b/17-3.6-4.0/README.md @@ -1,3 +1,3 @@ # pgRouting 4.0.1 (pg17) -pgRouting Docker image (version 4.0.1) built over [Postgres 17/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version 4.0.1) built over [Postgres 17/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/17-3.6-4.0/docker-compose.yml b/17-3.6-4.0/docker-compose.yml new file mode 100644 index 0000000..b7c3e8d --- /dev/null +++ b/17-3.6-4.0/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:17-3.6-4.0.1 + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/17-3.6-4.0/extra/Dockerfile b/17-3.6-4.0/extra/Dockerfile new file mode 100644 index 0000000..391a719 --- /dev/null +++ b/17-3.6-4.0/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:17-3.6-4.0.1 + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/17-3.6-4.0/version.txt b/17-3.6-4.0/version.txt new file mode 100644 index 0000000..c6ced01 --- /dev/null +++ b/17-3.6-4.0/version.txt @@ -0,0 +1 @@ +17-3.6-4.0.1 diff --git a/14-3.5-develop/Dockerfile b/17-3.6-develop/Dockerfile similarity index 78% rename from 14-3.5-develop/Dockerfile rename to 17-3.6-develop/Dockerfile index 49c810d..dd6bfa6 100644 --- a/14-3.5-develop/Dockerfile +++ b/17-3.6-develop/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:14-3.5 +FROM postgis/postgis:17-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=37797554f52613def04528ad22bf4234d5e2e476 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/17-3.5-develop/README.md b/17-3.6-develop/README.md similarity index 61% rename from 17-3.5-develop/README.md rename to 17-3.6-develop/README.md index b9a5396..acbfa42 100644 --- a/17-3.5-develop/README.md +++ b/17-3.6-develop/README.md @@ -1,3 +1,3 @@ # pgRouting develop (pg17) -pgRouting Docker image (version develop) built over [Postgres 17/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version develop) built over [Postgres 17/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/17-3.6-develop/docker-compose.yml b/17-3.6-develop/docker-compose.yml new file mode 100644 index 0000000..5a6d56d --- /dev/null +++ b/17-3.6-develop/docker-compose.yml @@ -0,0 +1,11 @@ +services: + pgrouting: + image: pgrouting/pgrouting:17-3.6-develop + ports: + - "5432:5432" + volumes: + - db-data:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=postgres +volumes: + db-data: diff --git a/17-3.6-develop/extra/Dockerfile b/17-3.6-develop/extra/Dockerfile new file mode 100644 index 0000000..e0bbbff --- /dev/null +++ b/17-3.6-develop/extra/Dockerfile @@ -0,0 +1,45 @@ +FROM pgrouting/pgrouting:17-3.6-develop + +ENV OSM2PGROUTING_VERSION=3.0.0 + +RUN apt update \ + && apt install -y \ + libpqxx-7.10 \ + && apt install -y \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat1 \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev=7.10.* \ + 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 --autoremove \ + build-essential \ + cmake \ + wget \ + libboost-program-options-dev \ + libexpat-dev \ + libosmium2-dev \ + libpqxx-dev \ + zlib1g-dev \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* diff --git a/17-3.6-develop/version.txt b/17-3.6-develop/version.txt new file mode 100644 index 0000000..197df32 --- /dev/null +++ b/17-3.6-develop/version.txt @@ -0,0 +1 @@ +17-3.6-develop diff --git a/17-3.5-main/Dockerfile b/17-3.6-main/Dockerfile similarity index 78% rename from 17-3.5-main/Dockerfile rename to 17-3.6-main/Dockerfile index 0848de9..6c3a804 100644 --- a/17-3.5-main/Dockerfile +++ b/17-3.6-main/Dockerfile @@ -1,4 +1,4 @@ -FROM postgis/postgis:17-3.5 +FROM postgis/postgis:17-3.6 LABEL maintainer="pgRouting Project - https://pgrouting.org" @@ -7,13 +7,13 @@ ENV PGROUTING_GIT_HASH=8988eebdff0e01327c9d48fe7c80b437dc9bc992 RUN apt update \ && apt install -y \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-graph1.74.0 \ - libboost-date-time1.74.0 \ - libboost-program-options1.74.0 \ - libboost-system1.74.0 \ - libboost-thread1.74.0 \ + libboost-atomic1.83.0 \ + libboost-chrono1.83.0 \ + libboost-graph1.83.0 \ + libboost-date-time1.83.0 \ + libboost-program-options1.83.0 \ + libboost-system1.83.0 \ + libboost-thread1.83.0 \ && apt install -y \ build-essential \ cmake \ diff --git a/17-3.5-main/README.md b/17-3.6-main/README.md similarity index 60% rename from 17-3.5-main/README.md rename to 17-3.6-main/README.md index 6577a5b..79441be 100644 --- a/17-3.5-main/README.md +++ b/17-3.6-main/README.md @@ -1,3 +1,3 @@ # pgRouting main (pg17) -pgRouting Docker image (version main) built over [Postgres 17/PostGIS 3.5](https://hub.docker.com/r/postgis/postgis) and dependencies. +pgRouting Docker image (version main) built over [Postgres 17/PostGIS 3.6](https://hub.docker.com/r/postgis/postgis) and dependencies. diff --git a/14-3.5-main/docker-compose.yml b/17-3.6-main/docker-compose.yml similarity index 80% rename from 14-3.5-main/docker-compose.yml rename to 17-3.6-main/docker-compose.yml index b67e509..a14060e 100644 --- a/14-3.5-main/docker-compose.yml +++ b/17-3.6-main/docker-compose.yml @@ -1,6 +1,6 @@ services: pgrouting: - image: pgrouting/pgrouting:14-3.5-main + image: pgrouting/pgrouting:17-3.6-main ports: - "5432:5432" volumes: diff --git a/14-3.5-3.7/extra/Dockerfile b/17-3.6-main/extra/Dockerfile similarity index 81% rename from 14-3.5-3.7/extra/Dockerfile rename to 17-3.6-main/extra/Dockerfile index fce626d..6b7f837 100644 --- a/14-3.5-3.7/extra/Dockerfile +++ b/17-3.6-main/extra/Dockerfile @@ -1,10 +1,10 @@ -FROM pgrouting/pgrouting:14-3.5-3.7.3 +FROM pgrouting/pgrouting:17-3.6-main ENV OSM2PGROUTING_VERSION=3.0.0 RUN apt update \ && apt install -y \ - libpqxx-6.4 \ + libpqxx-7.10 \ && apt install -y \ build-essential \ cmake \ @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ @@ -24,12 +24,12 @@ RUN apt update \ && cmake .. \ && make \ && make install \ - && cd ../tools/osmium/ \ - && 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 --autoremove \ diff --git a/17-3.6-main/version.txt b/17-3.6-main/version.txt new file mode 100644 index 0000000..fd2143a --- /dev/null +++ b/17-3.6-main/version.txt @@ -0,0 +1 @@ +17-3.6-main diff --git a/18-3.6-3.7/extra/Dockerfile b/18-3.6-3.7/extra/Dockerfile index 8e5dff8..c260d73 100644 --- a/18-3.6-3.7/extra/Dockerfile +++ b/18-3.6-3.7/extra/Dockerfile @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ diff --git a/18-3.6-3.8/extra/Dockerfile b/18-3.6-3.8/extra/Dockerfile index 642d5ac..e7d2bd2 100644 --- a/18-3.6-3.8/extra/Dockerfile +++ b/18-3.6-3.8/extra/Dockerfile @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ diff --git a/18-3.6-4.0/extra/Dockerfile b/18-3.6-4.0/extra/Dockerfile index f5b621c..6261134 100644 --- a/18-3.6-4.0/extra/Dockerfile +++ b/18-3.6-4.0/extra/Dockerfile @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ diff --git a/18-3.6-develop/extra/Dockerfile b/18-3.6-develop/extra/Dockerfile index 8455a05..817fc63 100644 --- a/18-3.6-develop/extra/Dockerfile +++ b/18-3.6-develop/extra/Dockerfile @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ diff --git a/18-3.6-main/extra/Dockerfile b/18-3.6-main/extra/Dockerfile index ee8a7aa..ea48633 100644 --- a/18-3.6-main/extra/Dockerfile +++ b/18-3.6-main/extra/Dockerfile @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=7.10.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ diff --git a/Makefile b/Makefile index cf4a0a1..85f0b85 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # When processing the rules for tagging and pushing container images with the # "latest" tag, the following variable will be the version that is considered # to be the latest. -LATEST_VERSION=17-3.5-3.7 +LATEST_VERSION=17-3.6-3.7 # The following logic evaluates VERSION variable that may have # been previously specified. diff --git a/README.md b/README.md index 2f5393a..c7beb6a 100644 --- a/README.md +++ b/README.md @@ -24,34 +24,32 @@ There are several versions available: - With pgRouting v3: - [4.0 with Postgres 18 + PostGIS 3.6](18-3.6-4.0/). Docker image: `pgrouting/pgrouting:18-3.6-4.0` - - [4.0 with Postgres 17 + PostGIS 3.5](17-3.5-4.0/). Docker image: `pgrouting/pgrouting:17-3.5-4.0` - - [4.0 with Postgres 16 + PostGIS 3.5](16-3.5-4.0/). Docker image: `pgrouting/pgrouting:16-3.5-4.0` - - [4.0 with Postgres 15 + PostGIS 3.5](15-3.5-4.0/). Docker image: `pgrouting/pgrouting:15-3.5-4.0` - - [4.0 with Postgres 14 + PostGIS 3.5](14-3.5-4.0/). Docker image: `pgrouting/pgrouting:14-3.5-4.0` + - [4.0 with Postgres 17 + PostGIS 3.6](17-3.6-4.0/). Docker image: `pgrouting/pgrouting:17-3.6-4.0` + - [4.0 with Postgres 16 + PostGIS 3.6](16-3.6-4.0/). Docker image: `pgrouting/pgrouting:16-3.6-4.0` + - [4.0 with Postgres 15 + PostGIS 3.6](15-3.6-4.0/). Docker image: `pgrouting/pgrouting:15-3.6-4.0` + - [4.0 with Postgres 14 + PostGIS 3.6](14-3.6-4.0/). Docker image: `pgrouting/pgrouting:14-3.6-4.0` - [3.8 with Postgres 18 + PostGIS 3.6](18-3.6-3.8/). Docker image: `pgrouting/pgrouting:18-3.6-3.8` - [3.8 with Postgres 17 + PostGIS 3.6](17-3.6-3.8/). Docker image: `pgrouting/pgrouting:17-3.6-3.8` - - [3.8 with Postgres 17 + PostGIS 3.5](17-3.5-3.8/). Docker image: `pgrouting/pgrouting:17-3.5-3.8` - - [3.8 with Postgres 16 + PostGIS 3.5](16-3.5-3.8/). Docker image: `pgrouting/pgrouting:16-3.5-3.8` - - [3.8 with Postgres 15 + PostGIS 3.5](15-3.5-3.8/). Docker image: `pgrouting/pgrouting:15-3.5-3.8` - - [3.8 with Postgres 14 + PostGIS 3.5](14-3.5-3.8/). Docker image: `pgrouting/pgrouting:14-3.5-3.8` + - [3.8 with Postgres 16 + PostGIS 3.6](16-3.6-3.8/). Docker image: `pgrouting/pgrouting:16-3.6-3.8` + - [3.8 with Postgres 15 + PostGIS 3.6](15-3.6-3.8/). Docker image: `pgrouting/pgrouting:15-3.6-3.8` + - [3.8 with Postgres 14 + PostGIS 3.6](14-3.6-3.8/). Docker image: `pgrouting/pgrouting:14-3.6-3.8` - [3.7 with Postgres 18 + PostGIS 3.6](18-3.6-3.7/). Docker image: `pgrouting/pgrouting:18-3.6-3.7` - [3.7 with Postgres 17 + PostGIS 3.6](17-3.6-3.7/). Docker image: `pgrouting/pgrouting:17-3.6-3.7` - - [3.7 with Postgres 17 + PostGIS 3.5](17-3.5-3.7/). Docker image: `pgrouting/pgrouting:17-3.5-3.7` - - [3.7 with Postgres 16 + PostGIS 3.5](16-3.5-3.7/). Docker image: `pgrouting/pgrouting:16-3.5-3.7` - - [3.7 with Postgres 15 + PostGIS 3.5](15-3.5-3.7/). Docker image: `pgrouting/pgrouting:15-3.5-3.7` - - [3.7 with Postgres 14 + PostGIS 3.5](14-3.5-3.7/). Docker image: `pgrouting/pgrouting:14-3.5-3.7` + - [3.7 with Postgres 16 + PostGIS 3.6](16-3.6-3.7/). Docker image: `pgrouting/pgrouting:16-3.6-3.7` + - [3.7 with Postgres 15 + PostGIS 3.6](15-3.6-3.7/). Docker image: `pgrouting/pgrouting:15-3.6-3.7` + - [3.7 with Postgres 14 + PostGIS 3.6](14-3.6-3.7/). Docker image: `pgrouting/pgrouting:14-3.6-3.7` - With pgRouting main branch (*): - [main branch with Postgres 18 + PostGIS 3.6](18-3.6-main/). Docker image: `pgrouting/pgrouting:18-3.6-main` - - [main branch with Postgres 17 + PostGIS 3.5](17-3.5-main/). Docker image: `pgrouting/pgrouting:17-3.5-main` - - [main branch with Postgres 16 + PostGIS 3.5](16-3.5-main/). Docker image: `pgrouting/pgrouting:16-3.5-main` - - [main branch with Postgres 15 + PostGIS 3.5](15-3.5-main/). Docker image: `pgrouting/pgrouting:15-3.5-main` - - [main branch with Postgres 14 + PostGIS 3.5](14-3.5-main/). Docker image: `pgrouting/pgrouting:14-3.5-main` + - [main branch with Postgres 17 + PostGIS 3.6](17-3.6-main/). Docker image: `pgrouting/pgrouting:17-3.6-main` + - [main branch with Postgres 16 + PostGIS 3.6](16-3.6-main/). Docker image: `pgrouting/pgrouting:16-3.6-main` + - [main branch with Postgres 15 + PostGIS 3.6](15-3.6-main/). Docker image: `pgrouting/pgrouting:15-3.6-main` + - [main branch with Postgres 14 + PostGIS 3.6](14-3.6-main/). Docker image: `pgrouting/pgrouting:14-3.6-main` - With pgRouting develop branch (*): - [develop branch with Postgres 18 + PostGIS 3.6](18-3.6-develop/). Docker image: `pgrouting/pgrouting:18-3.6-develop` - - [develop branch with Postgres 17 + PostGIS 3.5](17-3.5-develop/). Docker image: `pgrouting/pgrouting:17-3.5-develop` - - [develop branch with Postgres 16 + PostGIS 3.5](16-3.5-develop/). Docker image: `pgrouting/pgrouting:16-3.5-develop` - - [develop branch with Postgres 15 + PostGIS 3.5](15-3.5-develop/). Docker image: `pgrouting/pgrouting:15-3.5-develop` - - [develop branch with Postgres 14 + PostGIS 3.5](14-3.5-develop/). Docker image: `pgrouting/pgrouting:14-3.5-develop` + - [develop branch with Postgres 17 + PostGIS 3.6](17-3.6-develop/). Docker image: `pgrouting/pgrouting:17-3.6-develop` + - [develop branch with Postgres 16 + PostGIS 3.6](16-3.6-develop/). Docker image: `pgrouting/pgrouting:16-3.6-develop` + - [develop branch with Postgres 15 + PostGIS 3.6](15-3.6-develop/). Docker image: `pgrouting/pgrouting:15-3.6-develop` + - [develop branch with Postgres 14 + PostGIS 3.6](14-3.6-develop/). Docker image: `pgrouting/pgrouting:14-3.6-develop` (*) If you want to use the last versions of develop or main branches you should consider to build the image by your own. See [here](#how-to-build-images) how to build images: @@ -59,9 +57,9 @@ There are several versions available: `{PostgreSQL major}-{PostGIS major/minor}-{pgRouting version}` -Tag for pgRouting 3.7.3 with PostgreSQL 17 and PostGIS 3.5: +Tag for pgRouting 3.7.3 with PostgreSQL 17 and PostGIS 3.6: -`pgrouting/pgrouting:17-3.5-3.7.3` +`pgrouting/pgrouting:17-3.6-3.7.3` ## How to use @@ -69,7 +67,7 @@ Tag for pgRouting 3.7.3 with PostgreSQL 17 and PostGIS 3.5: Run postgres database: ```sh -$ cd 17-3.5-3.7 +$ cd 17-3.6-3.7 $ docker compose up ``` @@ -77,7 +75,7 @@ $ docker compose up Run postgres database: ```sh -$ cd 17-3.5-3.7 +$ cd 17-3.6-3.7 $ docker run --name pgrouting -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d pgrouting/pgrouting:$(cat version.txt) ``` @@ -85,7 +83,7 @@ $ docker run --name pgrouting -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d pgro Building images: ```sh -$ cd 17-3.5-3.7 +$ cd 17-3.6-3.7 $ docker build -t pgrouting/pgrouting:$(cat version.txt) . ``` @@ -135,9 +133,9 @@ test=# To make new version for example `x.x`, run following: ``` -mkdir 17-3.5-x.x -touch 17-3.5-x.x/Dockerfile -touch 17-3.5-x.x/version.txt +mkdir 17-3.6-x.x +touch 17-3.6-x.x/Dockerfile +touch 17-3.6-x.x/version.txt make update ``` diff --git a/extra/Dockerfile.template b/extra/Dockerfile.template index d76e486..61b0585 100644 --- a/extra/Dockerfile.template +++ b/extra/Dockerfile.template @@ -13,7 +13,7 @@ RUN apt update \ libexpat1 \ libexpat-dev \ libosmium2-dev \ - libpqxx-dev \ + libpqxx-dev=%%PQXX_VERSION%%.* \ zlib1g-dev \ && cd /usr/local/src \ && wget https://github.com/pgRouting/osm2pgrouting/archive/v${OSM2PGROUTING_VERSION}.tar.gz \ diff --git a/update.sh b/update.sh index a9d4b98..7864745 100755 --- a/update.sh +++ b/update.sh @@ -19,10 +19,10 @@ declare -A debianSuite=( [11]='bullseye-slim' [12]='bullseye-slim' [13]='bullseye-slim' - [14]='bullseye-slim' - [15]='bullseye-slim' - [16]='bullseye-slim' - [17]='bullseye-slim' + [14]='trixie-slim' + [15]='trixie-slim' + [16]='trixie-slim' + [17]='trixie-slim' [18]='trixie-slim' )