From e70cc37843a54474e070e4d3d1692bfce5793e93 Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Thu, 9 Jan 2025 07:53:15 +0100
Subject: [PATCH] Patch level updates for images (#452)

---
 .env.dist              | 8 ++++----
 .github/updatecli.yaml | 4 ++--
 docker-compose.yml     | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env.dist b/.env.dist
index c2060ad..95adfd7 100644
--- a/.env.dist
+++ b/.env.dist
@@ -1,7 +1,7 @@
-# ELASTICSEARCH_VERSION=8.16.1
+# ELASTICSEARCH_VERSION=8.17.0
 # IMAGE_REPO=ghcr.io/zammad/zammad
 # MEMCACHE_SERVERS=zammad-memcached:11211
-# MEMCACHE_VERSION=1.6.32-alpine
+# MEMCACHE_VERSION=1.6.34-alpine
 # NGINX_PORT=8080
 # NGINX_EXPOSE_PORT=8080
 # POSTGRES_DB=zammad_production
@@ -12,10 +12,10 @@
 # POSTGRES_VERSION=17.2-alpine
 # POSTGRESQL_OPTIONS=?pool=50
 # REDIS_URL=redis://zammad-redis:6379
-# REDIS_VERSION=7.4.1-alpine
+# REDIS_VERSION=7.4.2-alpine
 # RESTART=always
 # Use a fixed version. You are responsible to update this to newer patch level versions yourself.
-# VERSION=6.4.1
+# VERSION=6.4.1-19
 # You can also use floating versions that will give you automatic updates:
 # VERSION=6.2     # all patchlevel updates
 # VERSION=6       # including minor updates
diff --git a/.github/updatecli.yaml b/.github/updatecli.yaml
index 0ef34f8..1d94c87 100644
--- a/.github/updatecli.yaml
+++ b/.github/updatecli.yaml
@@ -6,9 +6,9 @@ sources:
     spec:
       image: "zammad/zammad-docker-compose"
       architecture: "linux/amd64"
-      tagfilter: "^6\\.4\\.1$"
+      # tagfilter: "^6\\.4\\.1$"
       # tagfilter: "^6\\.4\\.1-\\d{1}"
-      # tagfilter: "^6\\.4\\.1-\\d{2}"
+      tagfilter: "^6\\.4\\.1-\\d{2}"
       # tagfilter: "^6\\.4\\.1-\\d{3}"
   elasticsearch:
     kind: dockerimage
diff --git a/docker-compose.yml b/docker-compose.yml
index 0cedfa3..5c39092 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ x-shared:
       ZAMMAD_SESSION_JOBS:
       ZAMMAD_PROCESS_SCHEDULED:
       ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS:
-    image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.4.1}
+    image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.4.1-19}
     restart: ${RESTART:-always}
     volumes:
       - zammad-storage:/opt/zammad/storage
@@ -57,7 +57,7 @@ services:
     user: 0:0
 
   zammad-elasticsearch:
-    image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION:-8.16.1}
+    image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION:-8.17.0}
     restart: ${RESTART:-always}
     volumes:
       - elasticsearch-data:/bitnami/elasticsearch/data
@@ -72,7 +72,7 @@ services:
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:${MEMCACHE_VERSION:-1.6.32-alpine}
+    image: memcached:${MEMCACHE_VERSION:-1.6.34-alpine}
     restart: ${RESTART:-always}
 
   zammad-nginx:
@@ -100,7 +100,7 @@ services:
     command: ["zammad-railsserver"]
 
   zammad-redis:
-    image: redis:${REDIS_VERSION:-7.4.1-alpine}
+    image: redis:${REDIS_VERSION:-7.4.2-alpine}
     restart: ${RESTART:-always}
     volumes:
       - redis-data:/data