From 543e85019a0d466cf1d7c44b70834cd9fbe92e83 Mon Sep 17 00:00:00 2001 From: Tyler Satre Date: Tue, 17 Dec 2024 09:11:48 -0500 Subject: [PATCH] Fix Devcontainer for ARM Mac (#7723) * Update devcontainer.json * Create Dockerfile --- .devcontainer/Dockerfile | 2 ++ .devcontainer/devcontainer.json | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 000000000..4e841c04b --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,2 @@ +ARG BASE_IMAGE +FROM ${BASE_IMAGE} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 413866a66..07d6a4b0d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,13 @@ { "name": "OrcaSlicer", - "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04", + "build": { + "dockerfile": "Dockerfile", + "args": { + "PLATFORM": "linux/amd64", + "BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04" + }, + "options": ["--platform=linux/amd64"] + }, "runArgs": ["--env-file", "/tmp/devcontainer.env"], "features": { "ghcr.io/devcontainers/features/desktop-lite:1": { @@ -48,4 +55,4 @@ "Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh" }, "postCreateCommand": "sudo .devcontainer/postCreate.sh" -} \ No newline at end of file +}