Skip to content

feat build: fix devcontainer on mac #1281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Malevrovich wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −3
Open

feat build: fix devcontainer on mac #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
11 changes: 9 additions & 2 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"build": {
"dockerfile": "Dockerfile",
"context": ".."
"context": "..",
"options": [
"--platform=linux/amd64"
]
},
"containerEnv": {
"CCACHE_DIR": "/home/user/userver/.ccache",
Expand All @@ -18,6 +21,9 @@
"ms-azuretools.vscode-docker"
],
"settings": {
"github.copilot.enable": {
"*": false
},
"clangd.arguments": [
"--background-index",
"--compile-commands-dir=.vscode",
Expand All @@ -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"
}
}
Loading