Skip to content

Commit 5ac4210

Browse files
authored
fix199; Oslandia/SFCGAL migrates to GitLab + ./update.sh (#202)
* change sfcgal repo ; Oslandia/SFCGAL migrates from GitHub to GitLab fix #199 Changes to be committed: modified: Dockerfile.master.template modified: update.sh * update 12-master , 13-master (./update.sh)
1 parent ea730d9 commit 5ac4210

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

12-master/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ FROM postgres:12
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV SFCGAL_VERSION master
6-
ENV SFCGAL_GIT_HASH 4ab0dcf6f36c178caefd64b7d0c443342e76b6b9
6+
ENV SFCGAL_GIT_HASH 7e91a52fd90ef47e2f0b8925145e59ef1043fdd4
77
ENV PROJ_VERSION master
8-
ENV PROJ_GIT_HASH 0a995bb4219f5cf882503c1eb884474fdce53d12
8+
ENV PROJ_GIT_HASH b8fef0901bd92056b92b028476d160e0804de16b
99
ENV GDAL_VERSION master
10-
ENV GDAL_GIT_HASH 39111a0fe9b174302f67102bdd849e8290472d70
10+
ENV GDAL_GIT_HASH 1890a2eea4615d23093734c28164b076930d352a
1111
ENV GEOS_VERSION master
12-
ENV GEOS_GIT_HASH 19dc3b19338c2aded5197ca0e5a5456b028defbd
12+
ENV GEOS_GIT_HASH 0f938979b58f9a451670032a7199ece23d52c3c1
1313
ENV POSTGIS_VERSION master
14-
ENV POSTGIS_GIT_HASH 3334fd0675c98c79a6a8527a05fc0e8c4c371835
14+
ENV POSTGIS_GIT_HASH 6700df0e2db7965458b36f973d0216ce1cada762
1515

1616
RUN set -ex \
1717
&& apt-get update \
@@ -68,7 +68,7 @@ RUN set -ex \
6868
&& mkdir -p /usr/src/sfcgal \
6969
&& cd /usr/src/sfcgal \
7070
&& git init \
71-
&& git remote add origin https://github.com/Oslandia/SFCGAL.git \
71+
&& git remote add origin https://gitlab.com/Oslandia/SFCGAL.git \
7272
&& git fetch --depth 1 origin :${SFCGAL_GIT_HASH} \
7373
&& git reset --hard FETCH_HEAD \
7474
&& mkdir cmake-build \

13-master/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ FROM postgres:13
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV SFCGAL_VERSION master
6-
ENV SFCGAL_GIT_HASH 4ab0dcf6f36c178caefd64b7d0c443342e76b6b9
6+
ENV SFCGAL_GIT_HASH 7e91a52fd90ef47e2f0b8925145e59ef1043fdd4
77
ENV PROJ_VERSION master
8-
ENV PROJ_GIT_HASH 0a995bb4219f5cf882503c1eb884474fdce53d12
8+
ENV PROJ_GIT_HASH b8fef0901bd92056b92b028476d160e0804de16b
99
ENV GDAL_VERSION master
10-
ENV GDAL_GIT_HASH 39111a0fe9b174302f67102bdd849e8290472d70
10+
ENV GDAL_GIT_HASH 1890a2eea4615d23093734c28164b076930d352a
1111
ENV GEOS_VERSION master
12-
ENV GEOS_GIT_HASH 19dc3b19338c2aded5197ca0e5a5456b028defbd
12+
ENV GEOS_GIT_HASH 0f938979b58f9a451670032a7199ece23d52c3c1
1313
ENV POSTGIS_VERSION master
14-
ENV POSTGIS_GIT_HASH 3334fd0675c98c79a6a8527a05fc0e8c4c371835
14+
ENV POSTGIS_GIT_HASH 6700df0e2db7965458b36f973d0216ce1cada762
1515

1616
RUN set -ex \
1717
&& apt-get update \
@@ -68,7 +68,7 @@ RUN set -ex \
6868
&& mkdir -p /usr/src/sfcgal \
6969
&& cd /usr/src/sfcgal \
7070
&& git init \
71-
&& git remote add origin https://github.com/Oslandia/SFCGAL.git \
71+
&& git remote add origin https://gitlab.com/Oslandia/SFCGAL.git \
7272
&& git fetch --depth 1 origin :${SFCGAL_GIT_HASH} \
7373
&& git reset --hard FETCH_HEAD \
7474
&& mkdir cmake-build \

Dockerfile.master.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RUN set -ex \
6868
&& mkdir -p /usr/src/sfcgal \
6969
&& cd /usr/src/sfcgal \
7070
&& git init \
71-
&& git remote add origin https://github.com/Oslandia/SFCGAL.git \
71+
&& git remote add origin https://gitlab.com/Oslandia/SFCGAL.git \
7272
&& git fetch --depth 1 origin :${SFCGAL_GIT_HASH} \
7373
&& git reset --hard FETCH_HEAD \
7474
&& mkdir cmake-build \

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ declare -A postgisDebPkgNameVersionSuffixes=(
3434

3535
packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/'
3636

37-
sfcgalGitHash="$(git ls-remote https://github.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')"
37+
sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')"
3838
projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')"
3939
gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')"
4040
geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/master | awk '{ print $1}')"

0 commit comments

Comments
 (0)