From 78e1f589d9a093752e4e605682d54beabbd5c9e3 Mon Sep 17 00:00:00 2001
From: Georgi Panov <77702912+Darkfella91@users.noreply.github.com>
Date: Mon, 18 Nov 2024 01:34:58 +0200
Subject: [PATCH 1/4] Update Dockerfile

---
 .devcontainer/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2d7a4ae7c..7f89375c0 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -4,6 +4,8 @@ ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
+ENV SHELL=/bin/bash
+
 WORKDIR /tmp
 
 RUN apk add --no-cache \

From a57115a0bb8f1b8a3ada017a4c32198fb716d69b Mon Sep 17 00:00:00 2001
From: Georgi Panov <77702912+Darkfella91@users.noreply.github.com>
Date: Mon, 18 Nov 2024 01:39:33 +0200
Subject: [PATCH 2/4] Update Dockerfile

---
 .devcontainer/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7f89375c0..e8d4186e9 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,6 +22,7 @@ RUN apk add --no-cache \
     libstdc++ \
     direnv \
     unzip && \
+    echo 'eval "$(direnv hook bash)"' >> /root/.bashrc && \
     addgroup -g $USER_GID $USERNAME && \
     adduser -u $USER_UID -G $USERNAME -s /bin/sh -D $USERNAME && \
     curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \

From a44d246fbf7aee7dc90f032b2913eff6dbab478d Mon Sep 17 00:00:00 2001
From: Georgi Panov <77702912+Darkfella91@users.noreply.github.com>
Date: Mon, 18 Nov 2024 01:46:52 +0200
Subject: [PATCH 3/4] Update Dockerfile

---
 .devcontainer/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e8d4186e9..4051fa631 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,7 +22,8 @@ RUN apk add --no-cache \
     libstdc++ \
     direnv \
     unzip && \
-    echo 'eval "$(direnv hook bash)"' >> /root/.bashrc && \
+    { echo ''; echo 'eval "$(direnv hook bash)"'; } >> /root/.bashrc && \
+    cat /root/.bashrc && \
     addgroup -g $USER_GID $USERNAME && \
     adduser -u $USER_UID -G $USERNAME -s /bin/sh -D $USERNAME && \
     curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \

From ad89a95a707119cc45cfca0d12dca0faf7fe91d9 Mon Sep 17 00:00:00 2001
From: Georgi Panov <77702912+Darkfella91@users.noreply.github.com>
Date: Mon, 18 Nov 2024 02:11:49 +0200
Subject: [PATCH 4/4] Update Dockerfile

---
 .devcontainer/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4051fa631..3980999ff 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,10 +22,9 @@ RUN apk add --no-cache \
     libstdc++ \
     direnv \
     unzip && \
-    { echo ''; echo 'eval "$(direnv hook bash)"'; } >> /root/.bashrc && \
-    cat /root/.bashrc && \
     addgroup -g $USER_GID $USERNAME && \
     adduser -u $USER_UID -G $USERNAME -s /bin/sh -D $USERNAME && \
+    echo 'eval "$(direnv hook bash)"' >> /home/$USERNAME/.bashrc && \
     curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
     curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl.sha256" && \
     echo "$(cat kubectl.sha256)  kubectl" | sha256sum --check --strict && \