From 4acc41cc03e98378dd724ff3481066f27781a50e Mon Sep 17 00:00:00 2001
From: Andy Oknen <andy.oknen@yandex.ru>
Date: Tue, 29 Jul 2025 21:21:47 +0000
Subject: [PATCH] Update devcontainer configuration and Dockerfile to improve
 environment setup

---
 .devcontainer/devcontainer.json        | 2 +-
 .gitignore                             | 1 +
 contrib/docker/devcontainer/Dockerfile | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fb1eb82b..ed89e925 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -44,7 +44,7 @@
         "GOMODCACHE": "/home/vscode/.cache/go-mod"
     },
     // Post create command to set up the environment
-    "postCreateCommand": "mkdir -p /home/vscode/.cache/go-build /home/vscode/.cache/go-mod && cd /workspace && go mod download && go mod tidy",
+    "postCreateCommand": "mkdir -p /home/vscode/.cache/go-build /home/vscode/.cache/go-mod && cd /workspaces/yggdrasil-go && go mod download && go mod tidy",
     // Keep the container running
     "overrideCommand": false,
     // Use non-root user
diff --git a/.gitignore b/.gitignore
index ff064bd6..78a92910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 /yggdrasil
 /yggdrasilctl
 /yggdrasil.conf
+/yggdrasil.json
 /run
 /test
\ No newline at end of file
diff --git a/contrib/docker/devcontainer/Dockerfile b/contrib/docker/devcontainer/Dockerfile
index 0380a261..02d74057 100644
--- a/contrib/docker/devcontainer/Dockerfile
+++ b/contrib/docker/devcontainer/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y \
     ca-certificates \
     sudo \
     zsh \
+    locales \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -51,6 +52,9 @@ USER $USERNAME
 ENV SHELL=/bin/zsh
 RUN echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> ~/.zshrc \
     && echo 'export GO111MODULE=on' >> ~/.zshrc \
+    && echo 'export LANG=C.UTF-8' >> ~/.zshrc \
+    && echo 'export LC_ALL=C.UTF-8' >> ~/.zshrc \
+    && echo 'export LC_CTYPE=C.UTF-8' >> ~/.zshrc \
     && mkdir -p ~/.cache
 
 # Expose common ports that might be used by Yggdrasil