From db84c2d13a53aba83195c50486e49948acaf4519 Mon Sep 17 00:00:00 2001
From: Pascal Bleser <p.bleser@opencloud.eu>
Date: Wed, 17 Jun 2026 15:06:57 +0200
Subject: [PATCH] groupware: fix building the stalwart:cli container

 * fix the inline dockerfile for building the stalwart:cli container,
   cannot be based on scratch since we need a shell and wget, and it
   should thus retain the alpine container as its base

 * remove stdin_open and tty from the container attributes, not needed
---
 devtools/deployments/opencloud_full/stalwart.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/devtools/deployments/opencloud_full/stalwart.yml b/devtools/deployments/opencloud_full/stalwart.yml
index 09cf23afe5..58e3f7b284 100644
--- a/devtools/deployments/opencloud_full/stalwart.yml
+++ b/devtools/deployments/opencloud_full/stalwart.yml
@@ -57,15 +57,13 @@ services:
       dockerfile_inline: |
         FROM alpine:latest AS downloader
         ARG VERSION
-        RUN apk add --no-cache curl tar xz
+        RUN apk add --no-cache curl tar xz wget
         RUN arch=$(apk --print-arch) && \
             mkdir /cli && \
             curl --proto '=https' --tlsv1.2 -LsSf \
               https://github.com/stalwartlabs/cli/releases/download/v$${VERSION}/stalwart-cli-$${arch}-unknown-linux-musl.tar.xz \
               | tar xJf - --strip-components=1 -C /cli
-
-        FROM scratch
-        COPY --from=downloader /cli/stalwart-cli /stalwart-cli
+        RUN mv /cli/stalwart-cli /stalwart-cli && rm -rf /cli/
         CMD ["/stalwart-cli"]
 
     networks:
@@ -91,8 +89,6 @@ services:
         touch /var/lib/stalwart/.initialized
         echo "Successfully initialized"
 
-    stdin_open: true
-    tty: true
     depends_on:
       - stalwart