From 5d5fc75958ad26f08ca95cba3adf6dbb4fe65660 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Tue, 31 May 2022 17:47:06 -0400 Subject: [PATCH] chore: fix missing devcontainer dependencies (#4024) --- .devcontainer/devcontainer.json | 2 +- docker/app.Dockerfile | 2 ++ docker/base.Dockerfile | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f1f18f5b4..89ad1dca3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -70,7 +70,7 @@ "dbaeumer.vscode-eslint", "eamodio.gitlens", "editorconfig.editorconfig", - "johnsoncodehk.volar", + "vue.volar", "mrmlnc.vscode-duplicate", "ms-azuretools.vscode-docker", "ms-python.python", diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile index 91726167c..ca2ec1bb8 100644 --- a/docker/app.Dockerfile +++ b/docker/app.Dockerfile @@ -42,11 +42,13 @@ RUN groupmod --gid $USER_GID $USERNAME \ && chown -R $USER_UID:$USER_GID /home/$USERNAME \ || exit 0 +# Switch to local dev user USER dev:dev # Install current datatracker python dependencies COPY requirements.txt /tmp/pip-tmp/ RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location -r /tmp/pip-tmp/requirements.txt +RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location pylint pylint-common pylint-django RUN sudo rm -rf /tmp/pip-tmp VOLUME [ "/assets" ] diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index 61b168880..3203b8a07 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -4,8 +4,9 @@ LABEL maintainer="IETF Tools Team " ENV DEBIAN_FRONTEND=noninteractive # Update system packages -RUN apt-get update -RUN apt-get -qy upgrade +RUN apt-get update \ + && apt-get -qy upgrade \ + && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 # Add Node.js Source RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - @@ -19,7 +20,6 @@ RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/d RUN apt-get update --fix-missing && apt-get install -qy \ apache2-utils \ apt-file \ - apt-utils \ bash \ build-essential \ curl \