diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d43ae132..e22da202 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,11 @@ ARG PYTHON_VERSION=3.10 FROM mcr.microsoft.com/devcontainers/python:${PYTHON_VERSION} +# Install Node.js and Yarn +RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \ + apt-get install -y nodejs + +# Setup working directory WORKDIR /workspace # --- Python Server App Dependencies --- @@ -28,8 +33,8 @@ RUN sed -i "s/dynamic = \\[\"version\"\\]/version = \"$VERSION\"/" pyproject.tom COPY src/interface/web/package.json src/interface/web/yarn.lock ./src/interface/web/ # Install web app dependencies -# note: node and yarn will be available from the "features" in devcontainer.json -RUN yarn install --cwd ./src/interface/web && yarn export --cwd ./src/interface/web +# note: yarn will be available from the "features" in devcontainer.json +RUN yarn install --cwd ./src/interface/web # The .venv and node_modules are now populated in the image. # The rest of the source code will be mounted by VS Code from your local checkout, diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index da775470..8b3cc2de 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -80,10 +80,6 @@ }, "postCreateCommand": "scripts/dev_setup.sh", "features": { - "ghcr.io/devcontainers-contrib/features/black:2": {}, - "ghcr.io/devcontainers-contrib/features/mypy:2": {}, - "ghcr.io/devcontainers-contrib/features/isort:2": {}, - "ghcr.io/devcontainers-contrib/features/pre-commit:2": {}, "ghcr.io/devcontainers/features/github-cli:1": {}, "ghcr.io/devcontainers/features/node:1": { "version": "lts",