From 4b10b154b3118c7512c3b0413c042d03c708e0be Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sat, 19 Sep 2020 12:36:48 +0200 Subject: [PATCH] try fixing ra --- .devcontainer/Dockerfile | 19 ++++++++++++++----- .devcontainer/devcontainer.json | 8 +------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1dafdf0f..7168d4d6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,16 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/rust/.devcontainer/base.Dockerfile +FROM ubuntu:18.04 -FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1 +RUN apt-get update +RUN apt-get install -y \ + curl \ + git \ + gnupg2 \ + jq \ + sudo \ + zsh \ + vim \ + build-essential \ + openssl +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -# [Optional] Uncomment this section to install additional packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends +ENV PATH="/root/.cargo/bin:$PATH" \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b5f83b58..9b56a707 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,11 +5,6 @@ "build": { "dockerfile": "Dockerfile" }, - "runArgs": [ - "--cap-add=SYS_PTRACE", - "--security-opt", - "seccomp=unconfined" - ], // Set *default* container specific settings.json values on container create. "settings": { "terminal.integrated.shell.linux": "/bin/bash", @@ -22,11 +17,10 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ "matklad.rust-analyzer", - "bungcip.better-toml", "vadimcn.vscode-lldb", "mutantdino.resourcemonitor", "serayuzgur.crates", - "a5huynh.vscode-ron" + "ms-vsliveshare.vsliveshare" ] // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [],