From c8081ae7e0e2554ff63e66e61e7d63c0773d277e Mon Sep 17 00:00:00 2001 From: Ivan Skriabin Date: Tue, 30 Jun 2026 12:00:52 +0300 Subject: [PATCH] feat build: fix devcontainer on mac --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8b40bf8f6370..97ae5841322a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/userver-framework/ubuntu-24.04-userver-base:latest +FROM --platform=linux/amd64 ghcr.io/userver-framework/ubuntu-24.04-userver-base:latest # Setup clang toolchain, add "user" user COPY scripts/docker/setup-dev.sh /userver_tmp/ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0fbd6c682428..987793a1e751 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,10 @@ { "build": { "dockerfile": "Dockerfile", - "context": ".." + "context": "..", + "options": [ + "--platform=linux/amd64" + ] }, "containerEnv": { "CCACHE_DIR": "/home/user/userver/.ccache", @@ -18,6 +21,9 @@ "ms-azuretools.vscode-docker" ], "settings": { + "github.copilot.enable": { + "*": false + }, "clangd.arguments": [ "--background-index", "--compile-commands-dir=.vscode", @@ -43,10 +49,11 @@ "onCreateCommand": "git config --global --add safe.directory /home/user/userver", "remoteUser": "user", "runArgs": [ + "--platform=linux/amd64", "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], "workspaceFolder": "/home/user/userver", "workspaceMount": "source=${localWorkspaceFolder},target=/home/user/userver,type=bind" -} +} \ No newline at end of file