diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4e841c04bb..cc0f856acb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,2 +1,2 @@ -ARG BASE_IMAGE -FROM ${BASE_IMAGE} +ARG BASE_IMAGE +FROM ${BASE_IMAGE} \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 07d6a4b0d0..80e48691ea 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,14 +1,14 @@ { "name": "OrcaSlicer", "build": { - "dockerfile": "Dockerfile", - "args": { - "PLATFORM": "linux/amd64", - "BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04" - }, - "options": ["--platform=linux/amd64"] + "dockerfile": "Dockerfile", + "args": { + "PLATFORM": "linux/amd64", + "BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04" + }, + "options": ["--platform=linux/amd64"] }, - "runArgs": ["--env-file", "/tmp/devcontainer.env"], + "runArgs": ["--env-file", "/tmp/devcontainer.env", "--platform=linux/amd64"], "features": { "ghcr.io/devcontainers/features/desktop-lite:1": { "password": "orca" @@ -16,7 +16,7 @@ }, "customizations": { "vscode": { - "settings": { + "settings": { "cmake.configureArgs": [ "-DSLIC3R_GTK=3", "-DBBL_RELEASE_TO_PUBLIC=1",