From b3ac53f2dc743d4c1efeffa8a0965de6500b78ea Mon Sep 17 00:00:00 2001
From: vadim-kharin-codefresh <vadim.kharin@codefresh.io>
Date: Fri, 9 Jan 2026 14:45:45 +0200
Subject: [PATCH 1/3] chore: CR-32904 - update docker compose to v5.0.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cac8c009d9..688df49f12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # CI relies on this ARG. Don't remove or rename it
-ARG COMPOSE_VERSION=v2.40.3
+ARG COMPOSE_VERSION=v5.0.1
 FROM docker/compose-bin:${COMPOSE_VERSION} AS compose
 
 FROM debian:trixie-20251208-slim AS compose-plugin

From a95d9994954415fd1b5af321a540b08a27a1c204 Mon Sep 17 00:00:00 2001
From: vadim-kharin-codefresh <vadim.kharin@codefresh.io>
Date: Fri, 9 Jan 2026 14:47:08 +0200
Subject: [PATCH 2/3] bump version

---
 service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service.yaml b/service.yaml
index 3edec6d35f..a8ed905a5f 100644
--- a/service.yaml
+++ b/service.yaml
@@ -1 +1 @@
-version: 1.5.8
+version: 1.6.0

From 60fbf5b4c520912d40e5b4256b9872780bf00333 Mon Sep 17 00:00:00 2001
From: Zhenya Tikhonov <masontikhonov@gmail.com>
Date: Fri, 16 Jan 2026 19:53:32 +0400
Subject: [PATCH 3/3] build: use DHI base

---
 Dockerfile | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 688df49f12..912575fe68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,13 @@
 # CI relies on this ARG. Don't remove or rename it
 ARG COMPOSE_VERSION=v5.0.1
-FROM docker/compose-bin:${COMPOSE_VERSION} AS compose
+FROM docker/compose-bin:${COMPOSE_VERSION} AS compose-bin
 
-FROM debian:trixie-20251208-slim AS compose-plugin
+
+# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base
+FROM octopusdeploy/dhi-debian-base:trixie-debian13 AS compose-plugin
 WORKDIR /home/compose
-RUN groupadd --gid 3000 compose \
-  && useradd --uid 3000 \
-    --gid 3000 \
-    --home /home/compose \
-    --shell /bin/bash \
-    compose  
-COPY --from=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose
+COPY --chown=nonroot:nonroot --chmod=755 --from=compose-bin /docker-compose /usr/local/bin/docker-compose
 
 ENV COMPOSE_COMPATIBILITY=true
-USER compose:compose
+USER nonroot:nonroot
 ENTRYPOINT [ "docker-compose" ]