altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

chore: fix missing devcontainer dependencies (#4024)

Browse source
This commit is contained in:
Nicolas Giard 2022-05-31 17:47:06 -04:00 committed by GitHub
parent e02ce05612
commit 5d5fc75958
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/devcontainer.json
View file

@ -70,7 +70,7 @@
"dbaeumer.vscode-eslint", "dbaeumer.vscode-eslint",
"eamodio.gitlens", "eamodio.gitlens",
"editorconfig.editorconfig", "editorconfig.editorconfig",
"johnsoncodehk.volar", "vue.volar",
"mrmlnc.vscode-duplicate", "mrmlnc.vscode-duplicate",
"ms-azuretools.vscode-docker", "ms-azuretools.vscode-docker",
"ms-python.python", "ms-python.python",

2
docker/app.Dockerfile
View file

@ -42,11 +42,13 @@ RUN groupmod --gid $USER_GID $USERNAME \
&& chown -R $USER_UID:$USER_GID /home/$USERNAME \ && chown -R $USER_UID:$USER_GID /home/$USERNAME \
|| exit 0 || exit 0
# Switch to local dev user
USER dev:dev USER dev:dev
# Install current datatracker python dependencies # Install current datatracker python dependencies
COPY requirements.txt /tmp/pip-tmp/ 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 -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 RUN sudo rm -rf /tmp/pip-tmp
VOLUME [ "/assets" ] VOLUME [ "/assets" ]

6
docker/base.Dockerfile
View file

@ -4,8 +4,9 @@ LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Update system packages # Update system packages
RUN apt-get update RUN apt-get update \
RUN apt-get -qy upgrade && apt-get -qy upgrade \
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1
# Add Node.js Source # Add Node.js Source
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - 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 \ RUN apt-get update --fix-missing && apt-get install -qy \
apache2-utils \ apache2-utils \
apt-file \ apt-file \
apt-utils \
bash \ bash \
build-essential \ build-essential \
curl \ curl \