postgis · phillipross · Feb 12, 2020 · Feb 10, 2020 · Feb 10, 2020 · Feb 10, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -5,26 +5,26 @@ services: docker
 dist: xenial
 
 env:
-  - VERSION=9.4-2.5
-  - VERSION=9.4-2.5 VARIANT=alpine
-  - VERSION=9.5-2.5
-  - VERSION=9.5-2.5 VARIANT=alpine
-  - VERSION=9.6-2.5
-  - VERSION=9.6-2.5 VARIANT=alpine
-  - VERSION=10-2.5
-  - VERSION=10-2.5 VARIANT=alpine
-  - VERSION=11-2.5
-  - VERSION=11-2.5 VARIANT=alpine
   - VERSION=12-2.5
   - VERSION=12-2.5 VARIANT=alpine
+  - VERSION=11-2.5
+  - VERSION=11-2.5 VARIANT=alpine
+  - VERSION=10-2.5
+  - VERSION=10-2.5 VARIANT=alpine
+  - VERSION=9.6-2.5
+  - VERSION=9.6-2.5 VARIANT=alpine
+  - VERSION=9.5-3.0
+  - VERSION=9.5-3.0 VARIANT=alpine
+  - VERSION=9.5-2.5
+  - VERSION=9.5-2.5 VARIANT=alpine
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
 
 before_script:
   - env | grep -E "VARIANT|VERSION" | sort
   - cd "$VERSION/$VARIANT"
-  - image="appropriate/postgis:$VERSION${VARIANT:+-${VARIANT}}"
+  - image="postgis/postgis:$VERSION${VARIANT:+-${VARIANT}}"
 
 script:
   - docker build --pull -t "$image" .

diff --git a/10-2.5/README.md b/10-2.5/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/11-2.5/README.md b/11-2.5/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/12-2.5/README.md b/12-2.5/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/9.5-2.5/README.md b/9.5-2.5/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/9.4-2.5/Dockerfile → 9.5-3.0/Dockerfile b/9.4-2.5/Dockerfile → 9.5-3.0/Dockerfile
@@ -1,9 +1,9 @@
-FROM postgres:9.4
+FROM postgres:9.5
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_MAJOR 2.5
-ENV POSTGIS_VERSION 2.5.3+dfsg-3.pgdg90+1
+ENV POSTGIS_MAJOR 3
+ENV POSTGIS_VERSION 3.0.0+dfsg-2~exp1.pgdg90+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/9.4-2.5/README.md → 9.5-3.0/README.md b/9.4-2.5/README.md → 9.5-3.0/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/9.4-2.5/alpine/Dockerfile → 9.5-3.0/alpine/Dockerfile b/9.4-2.5/alpine/Dockerfile → 9.5-3.0/alpine/Dockerfile
@@ -1,9 +1,9 @@
-FROM postgres:9.4-alpine
+FROM postgres:9.5-alpine
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 2.5.3
-ENV POSTGIS_SHA256 402323c83d97f3859bc9083345dd687f933c261efe0830e1262c20c12671f794
+ENV POSTGIS_VERSION 3.0.0
+ENV POSTGIS_SHA256 1c83fb2fc8870d36ed49859c49a12c8c4c8ae8c5c3f912a21a951c5bcc249123
 
 RUN set -ex \
     \

diff --git a/9.4-2.5/alpine/initdb-postgis.sh → 9.5-3.0/alpine/initdb-postgis.sh b/9.4-2.5/alpine/initdb-postgis.sh → 9.5-3.0/alpine/initdb-postgis.sh
diff --git a/9.4-2.5/alpine/update-postgis.sh → 9.5-3.0/alpine/update-postgis.sh b/9.4-2.5/alpine/update-postgis.sh → 9.5-3.0/alpine/update-postgis.sh
diff --git a/9.4-2.5/initdb-postgis.sh → 9.5-3.0/initdb-postgis.sh b/9.4-2.5/initdb-postgis.sh → 9.5-3.0/initdb-postgis.sh
diff --git a/9.4-2.5/update-postgis.sh → 9.5-3.0/update-postgis.sh b/9.4-2.5/update-postgis.sh → 9.5-3.0/update-postgis.sh
diff --git a/9.6-2.5/README.md b/9.6-2.5/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template
@@ -1,5 +1,6 @@
 FROM postgres:%%PG_MAJOR%%-alpine
-MAINTAINER Régis Belson <[email protected]>
+
+LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_VERSION %%POSTGIS_VERSION%%
 ENV POSTGIS_SHA256 %%POSTGIS_SHA256%%
@@ -24,19 +25,19 @@ RUN set -ex \
     && apk add --no-cache --virtual .build-deps \
         autoconf \
         automake \
-        g++ \
+        file \
         json-c-dev \
         libtool \
         libxml2-dev \
         make \
         perl \
-    \
-    && apk add --no-cache --virtual .build-deps-edge \
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \    
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
+        clang-dev \
+        g++ \
+        gcc \
         gdal-dev \
         geos-dev \
-        proj4-dev \
+        llvm9-dev \
+        proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
     && ./autogen.sh \
@@ -48,16 +49,14 @@ RUN set -ex \
     && make install \
     && apk add --no-cache --virtual .postgis-rundeps \
         json-c \
-    && apk add --no-cache --virtual .postgis-rundeps-edge \
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \    
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \        
         geos \
         gdal \
-        proj4 \
+        proj \
+        libstdc++ \
         protobuf-c \
     && cd / \
     && rm -rf /usr/src/postgis \
-    && apk del .fetch-deps .build-deps .build-deps-edge
+    && apk del .fetch-deps .build-deps
 
 COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/postgis.sh
 COPY ./update-postgis.sh /usr/local/bin
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -1,5 +1,6 @@
 FROM postgres:%%PG_MAJOR%%
-MAINTAINER Mike Dillon <[email protected]>
+
+LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR %%POSTGIS_MAJOR%%
 ENV POSTGIS_VERSION %%POSTGIS_VERSION%%
@@ -9,7 +10,6 @@ RUN apt-get update \
       && apt-get install -y --no-install-recommends \
            postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
            postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
-           postgis=$POSTGIS_VERSION \
       && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /docker-entrypoint-initdb.d

diff --git a/Makefile b/Makefile
@@ -1,13 +1,15 @@
 VERSIONS = $(foreach df,$(wildcard */Dockerfile),$(df:%/Dockerfile=%))
+REPO_NAME  ?= postgis
+IMAGE_NAME ?= postgis
 
 all: build
 
 build: $(VERSIONS)
 
 define postgis-version
 $1:
-	docker build -t mdillon/postgis:$(shell echo $1 | sed -e 's/-.*//g') $1
-	docker build -t mdillon/postgis:$(shell echo $1 | sed -e 's/-.*//g')-alpine $1/alpine
+	docker build -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
+	docker build -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine
 endef
 $(foreach version,$(VERSIONS),$(eval $(call postgis-version,$(version))))
 

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # postgis/postgis
 
-[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/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)
+[![Build Status](https://travis-ci.org/postgis/docker-postgis.svg)](https://travis-ci.org/postgis/docker-postgis) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.4-9.6), Postgres 10, Postgres 11, and Postgres 12.
+The `postgis/postgis` image provides a Docker container running Postgres with [PostGIS 2.5](http://postgis.net/) installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for each version of Postgres 9 supported by the base image (9.5-9.6), Postgres 10, Postgres 11, and Postgres 12.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 

diff --git a/test/postgis-config.sh b/test/postgis-config.sh
@@ -1,5 +1,5 @@
-testAlias[appropriate/postgis]=postgres
+testAlias[postgis/postgis]=postgres
 
-imageTests[appropriate/postgis]='
+imageTests[postgis/postgis]='
 	postgis-basics
 '