diff --git a/.travis.yml b/.travis.yml index cf9f1d41..1c0c06a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ language: bash dist: trusty env: - - VERSION=9.0-2.1 - - VERSION=9.1-2.1 - - VERSION=9.2-2.1 - - VERSION=9.3-2.1 - - VERSION=9.4-2.1 + - VERSION=9.1-2.2 + - VERSION=9.2-2.2 + - VERSION=9.3-2.2 + - VERSION=9.4-2.2 + - VERSION=9.5-2.2 install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/9.0-2.1/README.md b/9.0-2.1/README.md deleted file mode 100644 index a84372f8..00000000 --- a/9.0-2.1/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# mdillon/postgis - -[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -The `postgis` image provides a Docker container running Postgres 9 with -[PostGIS 2.1](http://postgis.net/docs/manual-2.1/) installed. This image is -based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) -image and provides variants for each version of Postgres 9 supported by the -base image (9.0-9.4). - -This image ensures that the default database created by the parent `postgres` -image will have the `postgis` and `postgis_topology` extensions installed. -Unless `-e POSTGRES_DB` is passed to the container at startup time, this -database will be named after the admin user (either `postgres` or the user -specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and -`postgis_tiger_geocoder` extensions are also installed. - -If you would prefer to use the older template database mechanism for enabling -PostGIS, the image also provides a PostGIS-enabled template database called -`template_postgis`. - -## Usage - -In order to run a basic container capable of serving a PostGIS-enabled database, -start a container as follows: - - docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis - -For more detailed instructions about how to start and control your Postgres -container, see the documentation for the `postgres` image -[here](https://registry.hub.docker.com/_/postgres/). - -Once you have started a database container, you can then connect to the -database as follows: - - docker run -it --link some-postgis:postgres --rm postgres \ - sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' - -See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) -for more details on your options for creating and using a spatially-enabled database. diff --git a/9.1-2.1/README.md b/9.1-2.1/README.md deleted file mode 100644 index a84372f8..00000000 --- a/9.1-2.1/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# mdillon/postgis - -[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -The `postgis` image provides a Docker container running Postgres 9 with -[PostGIS 2.1](http://postgis.net/docs/manual-2.1/) installed. This image is -based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) -image and provides variants for each version of Postgres 9 supported by the -base image (9.0-9.4). - -This image ensures that the default database created by the parent `postgres` -image will have the `postgis` and `postgis_topology` extensions installed. -Unless `-e POSTGRES_DB` is passed to the container at startup time, this -database will be named after the admin user (either `postgres` or the user -specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and -`postgis_tiger_geocoder` extensions are also installed. - -If you would prefer to use the older template database mechanism for enabling -PostGIS, the image also provides a PostGIS-enabled template database called -`template_postgis`. - -## Usage - -In order to run a basic container capable of serving a PostGIS-enabled database, -start a container as follows: - - docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis - -For more detailed instructions about how to start and control your Postgres -container, see the documentation for the `postgres` image -[here](https://registry.hub.docker.com/_/postgres/). - -Once you have started a database container, you can then connect to the -database as follows: - - docker run -it --link some-postgis:postgres --rm postgres \ - sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' - -See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) -for more details on your options for creating and using a spatially-enabled database. diff --git a/9.1-2.1/Dockerfile b/9.1-2.2/Dockerfile similarity index 83% rename from 9.1-2.1/Dockerfile rename to 9.1-2.2/Dockerfile index 26a73263..09685533 100644 --- a/9.1-2.1/Dockerfile +++ b/9.1-2.2/Dockerfile @@ -1,8 +1,8 @@ FROM postgres:9.1 MAINTAINER Mike Dillon -ENV POSTGIS_MAJOR 2.1 -ENV POSTGIS_VERSION 2.1.8+dfsg-5~97.git43a09cc.pgdg80+1 +ENV POSTGIS_MAJOR 2.2 +ENV POSTGIS_VERSION 2.2.1+dfsg-2.pgdg80+1 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/9.1-2.2/README.md b/9.1-2.2/README.md new file mode 100644 index 00000000..c664eca3 --- /dev/null +++ b/9.1-2.2/README.md @@ -0,0 +1,24 @@ +# mdillon/postgis + +[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +The `mdillon/postgis` image provides a Docker container running Postgres 9 with [PostGIS](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides variants for each version of Postgres 9 supported by the base image (9.0-9.5) along with each version of PostGIS packaged for that Postgres version (2.1 or 2.2 as available). + +This image ensures that the default database created by the parent `postgres` image will have the `postgis` and `postgis_topology` extensions installed. Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and `postgis_tiger_geocoder` extensions are also installed. + +If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. + +## Usage + +In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: + + docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis + +For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). + +Once you have started a database container, you can then connect to the database as follows: + + docker run -it --link some-postgis:postgres --rm postgres \ + sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' + +See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database. diff --git a/9.0-2.1/initdb-postgis.sh b/9.1-2.2/initdb-postgis.sh similarity index 100% rename from 9.0-2.1/initdb-postgis.sh rename to 9.1-2.2/initdb-postgis.sh diff --git a/9.2-2.1/README.md b/9.2-2.1/README.md deleted file mode 100644 index a84372f8..00000000 --- a/9.2-2.1/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# mdillon/postgis - -[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -The `postgis` image provides a Docker container running Postgres 9 with -[PostGIS 2.1](http://postgis.net/docs/manual-2.1/) installed. This image is -based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) -image and provides variants for each version of Postgres 9 supported by the -base image (9.0-9.4). - -This image ensures that the default database created by the parent `postgres` -image will have the `postgis` and `postgis_topology` extensions installed. -Unless `-e POSTGRES_DB` is passed to the container at startup time, this -database will be named after the admin user (either `postgres` or the user -specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and -`postgis_tiger_geocoder` extensions are also installed. - -If you would prefer to use the older template database mechanism for enabling -PostGIS, the image also provides a PostGIS-enabled template database called -`template_postgis`. - -## Usage - -In order to run a basic container capable of serving a PostGIS-enabled database, -start a container as follows: - - docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis - -For more detailed instructions about how to start and control your Postgres -container, see the documentation for the `postgres` image -[here](https://registry.hub.docker.com/_/postgres/). - -Once you have started a database container, you can then connect to the -database as follows: - - docker run -it --link some-postgis:postgres --rm postgres \ - sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' - -See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) -for more details on your options for creating and using a spatially-enabled database. diff --git a/9.2-2.1/Dockerfile b/9.2-2.2/Dockerfile similarity index 83% rename from 9.2-2.1/Dockerfile rename to 9.2-2.2/Dockerfile index 07338476..e84f2554 100644 --- a/9.2-2.1/Dockerfile +++ b/9.2-2.2/Dockerfile @@ -1,8 +1,8 @@ FROM postgres:9.2 MAINTAINER Mike Dillon -ENV POSTGIS_MAJOR 2.1 -ENV POSTGIS_VERSION 2.1.8+dfsg-5~97.git43a09cc.pgdg80+1 +ENV POSTGIS_MAJOR 2.2 +ENV POSTGIS_VERSION 2.2.1+dfsg-2.pgdg80+1 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/9.2-2.2/README.md b/9.2-2.2/README.md new file mode 100644 index 00000000..c664eca3 --- /dev/null +++ b/9.2-2.2/README.md @@ -0,0 +1,24 @@ +# mdillon/postgis + +[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +The `mdillon/postgis` image provides a Docker container running Postgres 9 with [PostGIS](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides variants for each version of Postgres 9 supported by the base image (9.0-9.5) along with each version of PostGIS packaged for that Postgres version (2.1 or 2.2 as available). + +This image ensures that the default database created by the parent `postgres` image will have the `postgis` and `postgis_topology` extensions installed. Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and `postgis_tiger_geocoder` extensions are also installed. + +If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. + +## Usage + +In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: + + docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis + +For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). + +Once you have started a database container, you can then connect to the database as follows: + + docker run -it --link some-postgis:postgres --rm postgres \ + sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' + +See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database. diff --git a/9.1-2.1/initdb-postgis.sh b/9.2-2.2/initdb-postgis.sh similarity index 100% rename from 9.1-2.1/initdb-postgis.sh rename to 9.2-2.2/initdb-postgis.sh diff --git a/9.3-2.1/README.md b/9.3-2.1/README.md deleted file mode 100644 index a84372f8..00000000 --- a/9.3-2.1/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# mdillon/postgis - -[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -The `postgis` image provides a Docker container running Postgres 9 with -[PostGIS 2.1](http://postgis.net/docs/manual-2.1/) installed. This image is -based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) -image and provides variants for each version of Postgres 9 supported by the -base image (9.0-9.4). - -This image ensures that the default database created by the parent `postgres` -image will have the `postgis` and `postgis_topology` extensions installed. -Unless `-e POSTGRES_DB` is passed to the container at startup time, this -database will be named after the admin user (either `postgres` or the user -specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and -`postgis_tiger_geocoder` extensions are also installed. - -If you would prefer to use the older template database mechanism for enabling -PostGIS, the image also provides a PostGIS-enabled template database called -`template_postgis`. - -## Usage - -In order to run a basic container capable of serving a PostGIS-enabled database, -start a container as follows: - - docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis - -For more detailed instructions about how to start and control your Postgres -container, see the documentation for the `postgres` image -[here](https://registry.hub.docker.com/_/postgres/). - -Once you have started a database container, you can then connect to the -database as follows: - - docker run -it --link some-postgis:postgres --rm postgres \ - sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' - -See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) -for more details on your options for creating and using a spatially-enabled database. diff --git a/9.3-2.1/Dockerfile b/9.3-2.2/Dockerfile similarity index 83% rename from 9.3-2.1/Dockerfile rename to 9.3-2.2/Dockerfile index 0d8b5a4c..2587a9b2 100644 --- a/9.3-2.1/Dockerfile +++ b/9.3-2.2/Dockerfile @@ -1,8 +1,8 @@ FROM postgres:9.3 MAINTAINER Mike Dillon -ENV POSTGIS_MAJOR 2.1 -ENV POSTGIS_VERSION 2.1.8+dfsg-5~97.git43a09cc.pgdg80+1 +ENV POSTGIS_MAJOR 2.2 +ENV POSTGIS_VERSION 2.2.1+dfsg-2.pgdg80+1 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/9.3-2.2/README.md b/9.3-2.2/README.md new file mode 100644 index 00000000..c664eca3 --- /dev/null +++ b/9.3-2.2/README.md @@ -0,0 +1,24 @@ +# mdillon/postgis + +[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +The `mdillon/postgis` image provides a Docker container running Postgres 9 with [PostGIS](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides variants for each version of Postgres 9 supported by the base image (9.0-9.5) along with each version of PostGIS packaged for that Postgres version (2.1 or 2.2 as available). + +This image ensures that the default database created by the parent `postgres` image will have the `postgis` and `postgis_topology` extensions installed. Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and `postgis_tiger_geocoder` extensions are also installed. + +If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. + +## Usage + +In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: + + docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis + +For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). + +Once you have started a database container, you can then connect to the database as follows: + + docker run -it --link some-postgis:postgres --rm postgres \ + sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' + +See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database. diff --git a/9.2-2.1/initdb-postgis.sh b/9.3-2.2/initdb-postgis.sh similarity index 100% rename from 9.2-2.1/initdb-postgis.sh rename to 9.3-2.2/initdb-postgis.sh diff --git a/9.4-2.1/README.md b/9.4-2.1/README.md deleted file mode 100644 index a84372f8..00000000 --- a/9.4-2.1/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# mdillon/postgis - -[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -The `postgis` image provides a Docker container running Postgres 9 with -[PostGIS 2.1](http://postgis.net/docs/manual-2.1/) installed. This image is -based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) -image and provides variants for each version of Postgres 9 supported by the -base image (9.0-9.4). - -This image ensures that the default database created by the parent `postgres` -image will have the `postgis` and `postgis_topology` extensions installed. -Unless `-e POSTGRES_DB` is passed to the container at startup time, this -database will be named after the admin user (either `postgres` or the user -specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and -`postgis_tiger_geocoder` extensions are also installed. - -If you would prefer to use the older template database mechanism for enabling -PostGIS, the image also provides a PostGIS-enabled template database called -`template_postgis`. - -## Usage - -In order to run a basic container capable of serving a PostGIS-enabled database, -start a container as follows: - - docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis - -For more detailed instructions about how to start and control your Postgres -container, see the documentation for the `postgres` image -[here](https://registry.hub.docker.com/_/postgres/). - -Once you have started a database container, you can then connect to the -database as follows: - - docker run -it --link some-postgis:postgres --rm postgres \ - sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' - -See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) -for more details on your options for creating and using a spatially-enabled database. diff --git a/9.4-2.1/Dockerfile b/9.4-2.2/Dockerfile similarity index 83% rename from 9.4-2.1/Dockerfile rename to 9.4-2.2/Dockerfile index b0110946..2c677577 100644 --- a/9.4-2.1/Dockerfile +++ b/9.4-2.2/Dockerfile @@ -1,8 +1,8 @@ FROM postgres:9.4 MAINTAINER Mike Dillon -ENV POSTGIS_MAJOR 2.1 -ENV POSTGIS_VERSION 2.1.8+dfsg-5~97.git43a09cc.pgdg80+1 +ENV POSTGIS_MAJOR 2.2 +ENV POSTGIS_VERSION 2.2.1+dfsg-2.pgdg80+1 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/9.4-2.2/README.md b/9.4-2.2/README.md new file mode 100644 index 00000000..c664eca3 --- /dev/null +++ b/9.4-2.2/README.md @@ -0,0 +1,24 @@ +# mdillon/postgis + +[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +The `mdillon/postgis` image provides a Docker container running Postgres 9 with [PostGIS](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides variants for each version of Postgres 9 supported by the base image (9.0-9.5) along with each version of PostGIS packaged for that Postgres version (2.1 or 2.2 as available). + +This image ensures that the default database created by the parent `postgres` image will have the `postgis` and `postgis_topology` extensions installed. Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and `postgis_tiger_geocoder` extensions are also installed. + +If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. + +## Usage + +In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: + + docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis + +For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). + +Once you have started a database container, you can then connect to the database as follows: + + docker run -it --link some-postgis:postgres --rm postgres \ + sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' + +See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database. diff --git a/9.3-2.1/initdb-postgis.sh b/9.4-2.2/initdb-postgis.sh similarity index 100% rename from 9.3-2.1/initdb-postgis.sh rename to 9.4-2.2/initdb-postgis.sh diff --git a/9.0-2.1/Dockerfile b/9.5-2.2/Dockerfile similarity index 79% rename from 9.0-2.1/Dockerfile rename to 9.5-2.2/Dockerfile index 6c76fc43..525ccfb8 100644 --- a/9.0-2.1/Dockerfile +++ b/9.5-2.2/Dockerfile @@ -1,8 +1,8 @@ -FROM postgres:9.0 +FROM postgres:9.5 MAINTAINER Mike Dillon -ENV POSTGIS_MAJOR 2.1 -ENV POSTGIS_VERSION 2.1.8+dfsg-5~97.git43a09cc.pgdg80+1 +ENV POSTGIS_MAJOR 2.2 +ENV POSTGIS_VERSION 2.2.1+dfsg-2.pgdg80+1 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/9.5-2.2/README.md b/9.5-2.2/README.md new file mode 100644 index 00000000..c664eca3 --- /dev/null +++ b/9.5-2.2/README.md @@ -0,0 +1,24 @@ +# mdillon/postgis + +[![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +The `mdillon/postgis` image provides a Docker container running Postgres 9 with [PostGIS](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides variants for each version of Postgres 9 supported by the base image (9.0-9.5) along with each version of PostGIS packaged for that Postgres version (2.1 or 2.2 as available). + +This image ensures that the default database created by the parent `postgres` image will have the `postgis` and `postgis_topology` extensions installed. Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and `postgis_tiger_geocoder` extensions are also installed. + +If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. + +## Usage + +In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: + + docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis + +For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). + +Once you have started a database container, you can then connect to the database as follows: + + docker run -it --link some-postgis:postgres --rm postgres \ + sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' + +See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database. diff --git a/9.4-2.1/initdb-postgis.sh b/9.5-2.2/initdb-postgis.sh similarity index 100% rename from 9.4-2.1/initdb-postgis.sh rename to 9.5-2.2/initdb-postgis.sh diff --git a/README.md b/README.md index a84372f8..c664eca3 100644 --- a/README.md +++ b/README.md @@ -2,39 +2,23 @@ [![Build Status](https://travis-ci.org/appropriate/docker-postgis.svg)](https://travis-ci.org/appropriate/docker-postgis) [![Join the chat at https://gitter.im/appropriate/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/appropriate/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -The `postgis` image provides a Docker container running Postgres 9 with -[PostGIS 2.1](http://postgis.net/docs/manual-2.1/) installed. This image is -based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) -image and provides variants for each version of Postgres 9 supported by the -base image (9.0-9.4). - -This image ensures that the default database created by the parent `postgres` -image will have the `postgis` and `postgis_topology` extensions installed. -Unless `-e POSTGRES_DB` is passed to the container at startup time, this -database will be named after the admin user (either `postgres` or the user -specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and -`postgis_tiger_geocoder` extensions are also installed. - -If you would prefer to use the older template database mechanism for enabling -PostGIS, the image also provides a PostGIS-enabled template database called -`template_postgis`. +The `mdillon/postgis` image provides a Docker container running Postgres 9 with [PostGIS](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides variants for each version of Postgres 9 supported by the base image (9.0-9.5) along with each version of PostGIS packaged for that Postgres version (2.1 or 2.2 as available). + +This image ensures that the default database created by the parent `postgres` image will have the `postgis` and `postgis_topology` extensions installed. Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). For Postgres 9.1+, the `fuzzystrmatch` and `postgis_tiger_geocoder` extensions are also installed. + +If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. ## Usage -In order to run a basic container capable of serving a PostGIS-enabled database, -start a container as follows: +In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d mdillon/postgis -For more detailed instructions about how to start and control your Postgres -container, see the documentation for the `postgres` image -[here](https://registry.hub.docker.com/_/postgres/). +For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). -Once you have started a database container, you can then connect to the -database as follows: +Once you have started a database container, you can then connect to the database as follows: docker run -it --link some-postgis:postgres --rm postgres \ sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' -See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) -for more details on your options for creating and using a spatially-enabled database. +See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database.