From ea7a259e79403f1dd4d13552cc4b216db2bf773f Mon Sep 17 00:00:00 2001
From: alfi0812 <43101280+alfi0812@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:57:55 +0100
Subject: [PATCH] Update Dockerfile (#29793)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove krew install. As it does not work in the docker file

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning
- [ ] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):` or `chore(chart-name):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: alfi0812 <43101280+alfi0812@users.noreply.github.com>
Signed-off-by: Kjeld Schouten <info@kjeldschouten.nl>
Co-authored-by: Kjeld Schouten <info@kjeldschouten.nl>
---
 .devcontainer/postCreateCommand.sh                         | 2 ++
 .../root/DOTREPLACEdevcontainer/postCreateCommand.sh       | 2 ++
 containers/apps/devcontainer/Dockerfile                    | 7 +++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
index 445d27d8089..4cc64c13890 100755
--- a/.devcontainer/postCreateCommand.sh
+++ b/.devcontainer/postCreateCommand.sh
@@ -12,6 +12,8 @@ fisher install nickeb96/puffer-fish
 fisher install PatrickF1/fzf.fish
 "
 
+kubectl krew install pv-mounter
+
 # Create/update virtual environment
 if ! grep -q "venv /workspaces/" .venv/pyvenv.cfg; then
     rm -rf .venv
diff --git a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh
index 445d27d8089..4cc64c13890 100755
--- a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh
+++ b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh
@@ -12,6 +12,8 @@ fisher install nickeb96/puffer-fish
 fisher install PatrickF1/fzf.fish
 "
 
+kubectl krew install pv-mounter
+
 # Create/update virtual environment
 if ! grep -q "venv /workspaces/" .venv/pyvenv.cfg; then
     rm -rf .venv
diff --git a/containers/apps/devcontainer/Dockerfile b/containers/apps/devcontainer/Dockerfile
index 84cb12ec49d..8eba0c9cf10 100644
--- a/containers/apps/devcontainer/Dockerfile
+++ b/containers/apps/devcontainer/Dockerfile
@@ -10,7 +10,9 @@ RUN \
 apk update && \
   apk --no-cache update && \
   apk --no-cache add \
-    sshfs && \
+    sshfs \
+    libc6-compat \
+    fuse && \
   rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
 # Download and set up the clustertool binary
@@ -30,9 +32,6 @@ ENV PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
 # add pvmounter to kubectl using crew
 RUN kubectl krew install pv-mounter
 
-# Needed for clustertool binaries
-RUN apk add libc6-compat
-
 # Maintainer and metadata
 LABEL "maintainer"="TrueCharts <info@truecharts.org>"
 LABEL "org.opencontainers.image.source"="https://github.com/truecharts/apps"