From 0a896455b36b426f126b3ac1a38c6704f6026060 Mon Sep 17 00:00:00 2001
From: Frank Kloeker <frank.kloeker@telekom.de>
Date: Fri, 17 Oct 2025 17:34:06 +0200
Subject: [PATCH 1/4] fix etcd

---
 etcd-tools/Dockerfile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/etcd-tools/Dockerfile b/etcd-tools/Dockerfile
index 0d48a9c..2d3c4e9 100644
--- a/etcd-tools/Dockerfile
+++ b/etcd-tools/Dockerfile
@@ -1,15 +1,24 @@
 FROM ubuntu:24.04
 
+ENV ETCD_VERSION=v3.6.5
+ENV ETCD_URL=https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
+
+
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      etcd \
-      etcd-client \
       jq \
+      tar \
       busybox \
       curl && \
+    curl -L ${ETCD_URL} -o /tmp/etcd.tar.gz && \
+    tar xzf /tmp/etcd.tar.gz -C /usr/local/bin --strip-components=1 etcd-${ETCD_VERSION}-linux-amd64/etcd etcd-${ETCD_VERSION}-linux-amd64/etcdctl && \
+    rm -rf /tmp/etcd.tar.gz && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 USER etcd
+
+RUN etcd --version && etcdctl version
+
 WORKDIR /
 
 ENTRYPOINT ["/bin/sh"]

From d71208b5bd9ecd2491403d94b505e0a6dd634333 Mon Sep 17 00:00:00 2001
From: Frank Kloeker <frank.kloeker@telekom.de>
Date: Fri, 17 Oct 2025 18:19:55 +0200
Subject: [PATCH 2/4] add etcd user

---
 etcd-tools/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etcd-tools/Dockerfile b/etcd-tools/Dockerfile
index 2d3c4e9..7c4cbf5 100644
--- a/etcd-tools/Dockerfile
+++ b/etcd-tools/Dockerfile
@@ -15,6 +15,9 @@ RUN apt-get update && \
     rm -rf /tmp/etcd.tar.gz && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
+RUN addgroup --gid 1000 etcd
+RUN adduser --gid 1000 etcd
+
 USER etcd
 
 RUN etcd --version && etcdctl version

From 77ea580e17ec85c40133eae8f5f4a8ad57593669 Mon Sep 17 00:00:00 2001
From: Frank Kloeker <frank.kloeker@telekom.de>
Date: Fri, 17 Oct 2025 18:26:29 +0200
Subject: [PATCH 3/4] add etcd user

---
 etcd-tools/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etcd-tools/Dockerfile b/etcd-tools/Dockerfile
index 7c4cbf5..0c691f3 100644
--- a/etcd-tools/Dockerfile
+++ b/etcd-tools/Dockerfile
@@ -15,8 +15,8 @@ RUN apt-get update && \
     rm -rf /tmp/etcd.tar.gz && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN addgroup --gid 1000 etcd
-RUN adduser --gid 1000 etcd
+RUN groupadd --gid 1000 etcd
+RUN useradd --gid 1000 etcd
 
 USER etcd
 

From 9f45e575a6281e256cfc0b039e63bc875b141efb Mon Sep 17 00:00:00 2001
From: Frank Kloeker <frank.kloeker@telekom.de>
Date: Fri, 17 Oct 2025 18:28:23 +0200
Subject: [PATCH 4/4] use ubuntu user in etcd-tools

---
 etcd-tools/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etcd-tools/Dockerfile b/etcd-tools/Dockerfile
index 0c691f3..a312455 100644
--- a/etcd-tools/Dockerfile
+++ b/etcd-tools/Dockerfile
@@ -15,10 +15,10 @@ RUN apt-get update && \
     rm -rf /tmp/etcd.tar.gz && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN groupadd --gid 1000 etcd
-RUN useradd --gid 1000 etcd
+#RUN groupadd --gid 1000 etcd
+#RUN useradd --gid 1000 etcd
 
-USER etcd
+USER ubuntu
 
 RUN etcd --version && etcdctl version