build: upgrade postgis to v14

naturalsolutions · Feb 3, 2022 · 43948c9 · 43948c9
1 parent e21ffbf
commit 43948c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.env.ci b/.env.ci
@@ -6,10 +6,10 @@ NS_ECOTEKA_STUDIO_DOMAIN_NAME=localhost
 NS_ECOTEKA_PROXY_API_PORT=8080
 NS_ECOTEKA_PROXY_CERTIFICATESRESOLVERS_LE_ACME_EMAIL=noreply@localhost
 NS_ECOTEKA_PROXY_HTTP_PORT=8000
-NS_ECOTEKA_PROXY_IMAGE=traefik:v2.2
+NS_ECOTEKA_PROXY_IMAGE=traefik:v2.6
 
 # DB
-NS_ECOTEKA_DB_IMAGE=postgis/postgis:12-master
+NS_ECOTEKA_DB_IMAGE=postgis/postgis:14-master
 NS_ECOTEKA_DB_NAME=ecoteka
 NS_ECOTEKA_DB_PASSWORD=password
 NS_ECOTEKA_DB_PORT=5432
@@ -89,4 +89,4 @@ NS_ECOTEKA_OSM_IMAGE=registry.gitlab.com/natural-solutions/ecoteka:osm-latest
 NS_ECOTEKA_LANDING_PAGE_IMAGE=registry.gitlab.com/natural-solutions/ecoteka-landing-page:latest
 
 # OSM_THUMBNAILS
-NS_ECOTEKA_OSM_THUMBNAILS_IMAGE=registry.gitlab.com/natural-solutions/ecoteka-osm-thumbnail:latest
+NS_ECOTEKA_OSM_THUMBNAILS_IMAGE=registry.gitlab.com/natural-solutions/ecoteka-osm-thumbnail:latest
diff --git a/.env.example b/.env.example
@@ -6,10 +6,8 @@ NS_ECOTEKA_STUDIO_DOMAIN_NAME={{ ns_ecoteka_studio_domain_name | default('localh
 NS_ECOTEKA_PROXY_API_PORT={{ ns_ecoteka_proxy_api_port | default('8080') }}
 NS_ECOTEKA_PROXY_CERTIFICATESRESOLVERS_LE_ACME_EMAIL={{ ns_ecoteka_proxy_certificatesresolvers_le_acme_email | default('noreply@localhost') }}
 NS_ECOTEKA_PROXY_HTTP_PORT={{ ns_ecoteka_proxy_http_port | default('8000') }}
-NS_ECOTEKA_PROXY_IMAGE={{ ns_ecoteka_proxy_image | default('traefik:v2.6') }}
 
 # DB
-NS_ECOTEKA_DB_IMAGE={{ ns_ecoteka_db_image | default('postgis/postgis:12-master') }}
 NS_ECOTEKA_DB_NAME={{ ns_ecoteka_db_name | default('ecoteka') }}
 NS_ECOTEKA_DB_PASSWORD={{ ns_ecoteka_db_password | default('password') }}
 NS_ECOTEKA_DB_PORT={{ ns_ecoteka_db_port | default('5432') }}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - celery_worker
       - tile_server
       - landing_page
-    image: ${NS_ECOTEKA_PROXY_IMAGE}
+    image: ${NS_ECOTEKA_PROXY_IMAGE:-traefik:v2.6}
     networks:
       - traefik
     volumes:
@@ -17,7 +17,7 @@ services:
       - traefik.enable=true
 
   db:
-    image: ${NS_ECOTEKA_DB_IMAGE}
+    image: ${NS_ECOTEKA_DB_IMAGE:-postgis/postgis:14-master}
     networks:
       - traefik
     volumes: