e correct postgres version

fabiang · Sep 16, 2024 · 711f933 · 711f933
1 parent f1353ba
commit 711f933
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,16 +40,22 @@ jobs:
         zabbix:
           - version: "4.0"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "5.0"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "6.0"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "6.2"
             suffix: "-latest"
+            postgress_version: "15-alpine"
           - version: "6.4"
             suffix: "-latest"
+            postgress_version: "16-alpine"
           - version: "7.0"
             suffix: "-latest"
+            postgress_version: "16-alpine"
 
     name: "Zabbix ${{ matrix.zabbix.version }} Integration Tests"
 
@@ -67,6 +73,7 @@ jobs:
       env:
         ZBX_VERSION: "${{ matrix.zabbix.version }}"
         ZBX_VERSION_SUFFIX: "${{ matrix.zabbix.suffix }}"
+        POSTGRES_VERSION: "${{ postgress_version }}"
 
     - name: Wait for Zabbix server to become available
       id: wait_for_server

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - ZBX_ALLOWUNSUPPORTEDDBVERSIONS=1
 
   database:
-    image: postgres
+    image: postgres:${POSTGRES_VERSION:-alpine}
     environment:
       - POSTGRES_USER=zabbix
       - POSTGRES_PASSWORD=zabbix