From 498b21864ecb772e85f0c36e565e7c6336eaa8b5 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Wed, 28 Feb 2024 10:47:09 +0800 Subject: [PATCH] Update devcontainers - setuptools support - pre-compile PyBitmessage --- .devcontainer/Dockerfile | 6 +++--- .devcontainer/devcontainer.json | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a60cf6b1..38a67283 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,6 +15,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ libcap-dev \ libssl-dev \ pylint \ + python-setuptools \ + python2.7 \ + python2.7-dev \ python3 \ python3-dev \ python3-flake8 \ @@ -26,9 +29,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ RUN apt-add-repository ppa:deadsnakes/ppa -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ - python2.7 python2.7-dev - RUN pip install 'tox<4' 'virtualenv<20.22.0' RUN groupadd --gid $USER_GID $USERNAME \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5023b996..91a470aa 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -16,6 +16,7 @@ ], "dockerFile": "Dockerfile", "postCreateCommand": "pip3 install -r requirements.txt", + "updateContentCommand": "python2.7 setup.py install --user", "remoteEnv": { "PATH": "${containerEnv:PATH}:/home/user/.local/bin" },