Skip to content

Commit 59ec942

Browse files
ImreSamuImreSamu
authored
fixing Dockerhub link(s) to the Dockerfile(s) (#304)
* change README dockerfile links to https://github.com/postgis/docker-postgis/blob/master/ so now working from the https://registry.hub.docker.com/r/postgis/postgis * update *-master Dockerfiles
1 parent 7224d1c commit 59ec942

File tree

5 files changed

+39
-38
lines changed

5 files changed

+39
-38
lines changed

‎13-master/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
85+
ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
134+
ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200-
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
200+
ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
201201
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
202-
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
202+
ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
203203

204204
# Minimal command line test.
205205
RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
217217

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH 5cc346ae8019da12ccd6162a3b9022a9600a3167
220+
ENV POSTGIS_GIT_HASH a31a43a7a74ad8f5c22b165c3c92bfd2f9ad92f7
221221

222222
RUN set -ex \
223223
&& apt-get update \

‎14-master/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
85+
ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
134+
ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200-
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
200+
ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
201201
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
202-
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
202+
ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
203203

204204
# Minimal command line test.
205205
RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
217217

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH 5cc346ae8019da12ccd6162a3b9022a9600a3167
220+
ENV POSTGIS_GIT_HASH a31a43a7a74ad8f5c22b165c3c92bfd2f9ad92f7
221221

222222
RUN set -ex \
223223
&& apt-get update \

‎15beta2-master/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
85+
ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
134+
ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200-
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
200+
ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
201201
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
202-
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
202+
ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
203203

204204
# Minimal command line test.
205205
RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
217217

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH 5cc346ae8019da12ccd6162a3b9022a9600a3167
220+
ENV POSTGIS_GIT_HASH a31a43a7a74ad8f5c22b165c3c92bfd2f9ad92f7
221221

222222
RUN set -ex \
223223
&& apt-get update \

‎README.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Recomended version for the new users: `postgis/postgis:14-3.2`
2929

3030
| DockerHub image | Dockerfile | OS | Postgres | PostGIS |
3131
| --------------- | ---------- | -- | -------- | ------- |
32-
| [postgis/postgis:10-2.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-2.5) | [Dockerfile](./10-2.5/Dockerfile) | debian:stretch | 10 | 2.5.5 |
33-
| [postgis/postgis:10-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-3.2) | [Dockerfile](./10-3.2/Dockerfile) | debian:bullseye | 10 | 3.2.1 |
34-
| [postgis/postgis:11-2.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-2.5) | [Dockerfile](./11-2.5/Dockerfile) | debian:stretch | 11 | 2.5.5 |
35-
| [postgis/postgis:11-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.2) | [Dockerfile](./11-3.2/Dockerfile) | debian:bullseye | 11 | 3.2.1 |
36-
| [postgis/postgis:12-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.2) | [Dockerfile](./12-3.2/Dockerfile) | debian:bullseye | 12 | 3.2.1 |
37-
| [postgis/postgis:13-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.2) | [Dockerfile](./13-3.2/Dockerfile) | debian:bullseye | 13 | 3.2.1 |
38-
| [postgis/postgis:14-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.2) | [Dockerfile](./14-3.2/Dockerfile) | debian:bullseye | 14 | 3.2.1 |
32+
| [postgis/postgis:10-2.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-2.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/10-2.5/Dockerfile) | debian:stretch | 10 | 2.5.5 |
33+
| [postgis/postgis:10-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-3.2) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/10-3.2/Dockerfile) | debian:bullseye | 10 | 3.2.1 |
34+
| [postgis/postgis:11-2.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-2.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-2.5/Dockerfile) | debian:stretch | 11 | 2.5.5 |
35+
| [postgis/postgis:11-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.2) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.2/Dockerfile) | debian:bullseye | 11 | 3.2.1 |
36+
| [postgis/postgis:12-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.2) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.2/Dockerfile) | debian:bullseye | 12 | 3.2.1 |
37+
| [postgis/postgis:13-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.2) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.2/Dockerfile) | debian:bullseye | 13 | 3.2.1 |
38+
| [postgis/postgis:14-3.2](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.2) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.2/Dockerfile) | debian:bullseye | 14 | 3.2.1 |
3939

4040
### Alpine based
4141

@@ -49,13 +49,13 @@ Recomended version for the new users: `postgis/postgis:14-3.2`
4949

5050
| DockerHub image | Dockerfile | OS | Postgres | PostGIS |
5151
| --------------- | ---------- | -- | -------- | ------- |
52-
| [postgis/postgis:10-2.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-2.5-alpine) | [Dockerfile](./10-2.5/alpine/Dockerfile) | alpine:3.16 | 10 | 2.5.5 |
53-
| [postgis/postgis:10-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-3.2-alpine) | [Dockerfile](./10-3.2/alpine/Dockerfile) | alpine:3.16 | 10 | 3.2.1 |
54-
| [postgis/postgis:11-2.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-2.5-alpine) | [Dockerfile](./11-2.5/alpine/Dockerfile) | alpine:3.16 | 11 | 2.5.5 |
55-
| [postgis/postgis:11-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.2-alpine) | [Dockerfile](./11-3.2/alpine/Dockerfile) | alpine:3.16 | 11 | 3.2.1 |
56-
| [postgis/postgis:12-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.2-alpine) | [Dockerfile](./12-3.2/alpine/Dockerfile) | alpine:3.16 | 12 | 3.2.1 |
57-
| [postgis/postgis:13-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.2-alpine) | [Dockerfile](./13-3.2/alpine/Dockerfile) | alpine:3.16 | 13 | 3.2.1 |
58-
| [postgis/postgis:14-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.2-alpine) | [Dockerfile](./14-3.2/alpine/Dockerfile) | alpine:3.16 | 14 | 3.2.1 |
52+
| [postgis/postgis:10-2.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-2.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/10-2.5/alpine/Dockerfile) | alpine:3.16 | 10 | 2.5.5 |
53+
| [postgis/postgis:10-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=10-3.2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/10-3.2/alpine/Dockerfile) | alpine:3.16 | 10 | 3.2.1 |
54+
| [postgis/postgis:11-2.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-2.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-2.5/alpine/Dockerfile) | alpine:3.16 | 11 | 2.5.5 |
55+
| [postgis/postgis:11-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.2/alpine/Dockerfile) | alpine:3.16 | 11 | 3.2.1 |
56+
| [postgis/postgis:12-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.2/alpine/Dockerfile) | alpine:3.16 | 12 | 3.2.1 |
57+
| [postgis/postgis:13-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.2/alpine/Dockerfile) | alpine:3.16 | 13 | 3.2.1 |
58+
| [postgis/postgis:14-3.2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.2/alpine/Dockerfile) | alpine:3.16 | 14 | 3.2.1 |
5959

6060
### Test images
6161

@@ -64,11 +64,11 @@ Recomended version for the new users: `postgis/postgis:14-3.2`
6464

6565
| DockerHub image | Dockerfile | OS | Postgres | PostGIS |
6666
| --------------- | ---------- | -- | -------- | ------- |
67-
| [postgis/postgis:13-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-master) | [Dockerfile](./13-master/Dockerfile) | debian:bullseye | 13 | development: postgis, geos, proj, gdal |
68-
| [postgis/postgis:14-3.3.0beta2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.3.0beta2-alpine) | [Dockerfile](./14-3.3.0beta2/alpine/Dockerfile) | alpine:3.16 | 14 | 3.3.0beta2 |
69-
| [postgis/postgis:14-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-master) | [Dockerfile](./14-master/Dockerfile) | debian:bullseye | 14 | development: postgis, geos, proj, gdal |
70-
| [postgis/postgis:15beta2-3.3.0beta2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15beta2-3.3.0beta2-alpine) | [Dockerfile](./15beta2-3.3.0beta2/alpine/Dockerfile) | alpine:3.16 | 15beta2 | 3.3.0beta2 |
71-
| [postgis/postgis:15beta2-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15beta2-master) | [Dockerfile](./15beta2-master/Dockerfile) | debian:bullseye | 15beta2 | development: postgis, geos, proj, gdal |
67+
| [postgis/postgis:13-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-master/Dockerfile) | debian:bullseye | 13 | development: postgis, geos, proj, gdal |
68+
| [postgis/postgis:14-3.3.0beta2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.3.0beta2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.3.0beta2/alpine/Dockerfile) | alpine:3.16 | 14 | 3.3.0beta2 |
69+
| [postgis/postgis:14-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-master/Dockerfile) | debian:bullseye | 14 | development: postgis, geos, proj, gdal |
70+
| [postgis/postgis:15beta2-3.3.0beta2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15beta2-3.3.0beta2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15beta2-3.3.0beta2/alpine/Dockerfile) | alpine:3.16 | 15beta2 | 3.3.0beta2 |
71+
| [postgis/postgis:15beta2-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15beta2-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15beta2-master/Dockerfile) | debian:bullseye | 15beta2 | development: postgis, geos, proj, gdal |
7272

7373
## Usage
7474

‎update.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ versions=( "${versions[@]%/Dockerfile}" )
1313
for optimized in debian alpine test; do
1414
rm -f _dockerlists_${optimized}.md
1515
echo " " > _dockerlists_${optimized}.md
16-
echo "| DockerHub image | Dockerfile | OS | Postgres | PostGIS | " >> _dockerlists_${optimized}.md
17-
echo "| --------------- | ---------- | -- | -------- | ------- | " >> _dockerlists_${optimized}.md
16+
echo "| DockerHub image | Dockerfile | OS | Postgres | PostGIS |" >> _dockerlists_${optimized}.md
17+
echo "| --------------- | ---------- | -- | -------- | ------- |" >> _dockerlists_${optimized}.md
1818
done
1919

2020
dockerhublink="https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name="
21+
githubrepolink="https://github.com/postgis/docker-postgis/blob/master"
2122

2223
# sort version numbers with highest last (so it goes first in .travis.yml)
2324
IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -V) ); unset IFS
@@ -152,7 +153,7 @@ for version in "${versions[@]}"; do
152153
fi
153154
sed -i 's/%%PG_MAJOR%%/'$postgresVersion'/g; s/%%POSTGIS_MAJOR%%/'$postgisMajor'/g; s/%%POSTGIS_VERSION%%/'$postgisFullVersion'/g; s/%%POSTGIS_GIT_HASH%%/'$postgisGitHash'/g; s/%%SFCGAL_GIT_HASH%%/'$sfcgalGitHash'/g; s/%%PROJ_GIT_HASH%%/'$projGitHash'/g; s/%%GDAL_GIT_HASH%%/'$gdalGitHash'/g; s/%%GEOS_GIT_HASH%%/'$geosGitHash'/g; s/%%BOOST_VERSION%%/'"$boostVersion"'/g; s/%%DEBIAN_VERSION%%/'"$suite"'/g;' "$version/Dockerfile"
154155

155-
echo "| [postgis/postgis:${version}](${dockerhublink}${version}) | [Dockerfile](./$version/Dockerfile) | debian:${suite} | ${postgresVersion} | ${postgisDocSrc} | " >> _dockerlists_${optimized}.md
156+
echo "| [postgis/postgis:${version}](${dockerhublink}${version}) | [Dockerfile](${githubrepolink}/${version}/Dockerfile) | debian:${suite} | ${postgresVersion} | ${postgisDocSrc} |" >> _dockerlists_${optimized}.md
156157
)
157158
fi
158159

@@ -176,7 +177,7 @@ for version in "${versions[@]}"; do
176177
mv "$version/$variant/Dockerfile.alpine.template" "$version/$variant/Dockerfile"
177178
sed -i 's/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$srcVersion"'/g; s/%%POSTGIS_SHA256%%/'"$srcSha256"'/g' "$version/$variant/Dockerfile"
178179

179-
echo "| [postgis/postgis:${version}-${variant}](${dockerhublink}${version}-${variant}) | [Dockerfile](./$version/$variant/Dockerfile) | alpine:3.16 | ${postgresVersion} | ${postgisDocSrc} | " >> _dockerlists_${optimized}.md
180+
echo "| [postgis/postgis:${version}-${variant}](${dockerhublink}${version}-${variant}) | [Dockerfile](${githubrepolink}/${version}/${variant}/Dockerfile) | alpine:3.16 | ${postgresVersion} | ${postgisDocSrc} |" >> _dockerlists_${optimized}.md
180181
)
181182
done
182183
done

0 commit comments

Comments
 (0)