From a3bad0344dafca67ae238d09c47342d589725485 Mon Sep 17 00:00:00 2001 From: Koda YeenBean Date: Fri, 10 Jul 2026 17:34:35 +0000 Subject: [PATCH] fixed dev container --- .devcontainer/Dockerfile | 6 ++++++ .devcontainer/devcontainer.json | 13 ++++++------- Makefile | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1d9df78..bfb4428 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -22,8 +22,14 @@ RUN apt-get update && apt-get install -y \ patch \ time \ sudo \ + locales \ && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen + +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 + RUN adduser openwrt --disabled-password --gecos "" && \ echo "openwrt ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6bbd2de..ea99032 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,13 +4,12 @@ "dockerfile": "Dockerfile" }, "remoteUser": "openwrt", - - // 1. Overrides the default volume mount path "workspaceMount": "source=${localWorkspaceFolder},target=/home/openwrt/openwrt/package/OpenUniFi,type=bind,consistency=cached", - - // 2. Tells VS Code to open this directory when the container starts "workspaceFolder": "/home/openwrt/openwrt/package/OpenUniFi", - - // 3. Runs OpenWrt configuration routines after mounting your package - "postCreateCommand": "cd /home/openwrt/openwrt && ./scripts/feeds update -a && ./scripts/feeds install -a && cp .devcontainer/openwrt.config .config || true && make defconfig" + "postCreateCommand": "cd /home/openwrt/openwrt && ./scripts/feeds update -a && ./scripts/feeds install -a && cp package/OpenUniFi/.devcontainer/openwrt.config .config && make defconfig", + "customizations": { + "vscode": { + "extensions": ["openai.chatgpt", "ms-vscode.cpptools", "ms-vscode.cmake-tools", "ms-vscode.makefile-tools"] + } + } } \ No newline at end of file diff --git a/Makefile b/Makefile index 761cb0e..b185858 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ define Package/openuf CATEGORY := Network TITLE := openUF — UniFi bridge daemon for OpenWrt DEPENDS := +libmbedtls +libuci +libjson-c +kmod-tun - URL := https://github.com/openuf/openuf + URL := https://git.ascheu.de/Koda/OpenUniFi endef define Package/openuf/description