Merge branch 'bonfire-networks:main' into main

.github/workflows/bonfire.yaml

@@ -23,8 +23,7 @@ jobs:
       ENCRYPTION_SALT: "l+QT/gkdX722f57qSAUc+bZcqm5ZduXY4D0hp0glEiKdR267JsZ1/CZlrlhADcD8kzuaZGFWvJ2dlr6sujbzGQV5e04lKVIsZh3gfd8eqQBckIqH6L8TDRRz4M07YE+F"
     services:
       postgres:
-        # image: postgres
-        image: postgis/postgis:12-3.0-alpine
+        image: postgres:12-alpine
         env:
           POSTGRES_DB: bonfire_test
           POSTGRES_PASSWORD: postgres
@@ -103,7 +102,7 @@ jobs:
     services:
       postgres:
         # image: postgres
-        image: postgis/postgis:12-3.0-alpine
+        image: postgis/postgis:12-3.1-alpine
         env:
           POSTGRES_DB: bonfire_test
           POSTGRES_PASSWORD: postgres

Makefile

@@ -28,6 +28,7 @@ APP_REL_DOCKERCOMPOSE=docker-compose.release.yml
 APP_VSN ?= `grep -m 1 'version:' mix.exs | cut -d '"' -f2`
 APP_BUILD ?= `git rev-parse --short HEAD`
 APP_DOCKER_REPO="$(ORG_NAME)/$(APP_NAME)-$(FLAVOUR)"
+DB_DOCKER_IMAGE ?= postgis/postgis:12-3.1-alpine
 
 #### GENERAL SETUP RELATED COMMANDS ####
 

docker-compose.release.yml

@@ -39,7 +39,7 @@ services:
         source: ./data/uploads
         target: /frontend/uploads
   db:
-    image: postgis/postgis:12-3.0-alpine
+    image: ${DB_DOCKER_IMAGE}
     restart: always
     volumes:
       - "./data/postgres/prod:/var/lib/postgresql/data"

docker-compose.yml

@@ -34,7 +34,7 @@ services:
     tty: true # like docker run -t
     # user: $UID:$GID
   db:
-    image: postgis/postgis:12-3.1-alpine
+    image: ${DB_DOCKER_IMAGE}
     # volumes:
       # - ./data/postgres/dev:/var/lib/postgresql/data:z
       # - /etc/passwd:/etc/passwd:ro 

flavours/classic/config/templates/public.env

@@ -21,6 +21,7 @@ UPLOAD_LIMIT=20000000
 # ====================================
 # You should not have to edit any of the following ones:
 POSTGRES_HOST=localhost
+DB_DOCKER_IMAGE=postgres:12-alpine
 LANG=en_US.UTF-8
 REPLACE_OS_VARS=true
 LIVEVIEW_ENABLED=true

flavours/cooperation/config/templates/public.env

@@ -21,6 +21,7 @@ UPLOAD_LIMIT=20000000
 # ====================================
 # You should not have to edit any of the following ones:
 POSTGRES_HOST=localhost
+DB_DOCKER_IMAGE=postgis/postgis:12-3.1-alpine
 LANG=en_US.UTF-8
 REPLACE_OS_VARS=true
 LIVEVIEW_ENABLED=true

flavours/haha/config/templates/public.env

@@ -21,6 +21,7 @@ UPLOAD_LIMIT=20000000
 # ====================================
 # You should not have to edit any of the following ones:
 POSTGRES_HOST=localhost
+DB_DOCKER_IMAGE=postgres:12-alpine
 LANG=en_US.UTF-8
 REPLACE_OS_VARS=true
 LIVEVIEW_ENABLED=true

flavours/reflow/config/templates/public.env

@@ -22,6 +22,7 @@ UPLOAD_LIMIT=20000000
 # You should not have to edit any of the following ones:
 APP_NAME=reflow
 POSTGRES_HOST=localhost
+DB_DOCKER_IMAGE=postgis/postgis:12-3.1-alpine
 LANG=en_US.UTF-8
 REPLACE_OS_VARS=true
 LIVEVIEW_ENABLED=true