diff --git a/.devcontainer/debian-install.sh b/.devcontainer/debian-install.sh index 070c320..553774d 100644 --- a/.devcontainer/debian-install.sh +++ b/.devcontainer/debian-install.sh @@ -1,31 +1,9 @@ set -exo pipefail -apt update -y - -apt install -y \ - python3 \ - appstream \ - flatpak-builder \ - python3-pip \ - rustup \ - libglib2.0-dev \ - libostree-dev \ - ; - -apt clean -y - pip install --break-system-packages \ flit \ mypy \ - packaging \ - requirements-parser \ ruff \ tomlkit \ pydantic \ ; - -rustup default stable - -cargo install --git https://github.com/flatpak/flat-manager flat-manager-client - -flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d2322c2..a0d691d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,9 +12,11 @@ "runArgs": ["--device=/dev/fuse"], // Features to add to the dev container. More info: https://containers.dev/features. - // "features": { - // "ghcr.io/devcontainer-config/features/dot-config:4": {} - // }, + "features": { + "ghcr.io/devcontainers-extra/features/apt-packages": { + "packages": "python3,python-is-python3,appstream,flatpak-builder,python3-pip" + } + }, // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], @@ -26,21 +28,15 @@ "EditorConfig.EditorConfig", "charliermarsh.ruff", "ms-python.mypy-type-checker", - "ms-python.pylint", "ms-python.python", - "ms-python.vscode-pylance", "njpwerner.autodocstring", "tamasfe.even-better-toml", ] } }, - "remoteEnv": { - "PATH": "${containerEnv:PATH}:~/.cargo/bin", - }, - "onCreateCommand": "sudo sh .devcontainer/debian-install.sh", // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - "remoteUser": "root", + // "remoteUser": "root", }