diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f9462b0..82497ce 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,38 +1,22 @@ -#------------------------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. -#------------------------------------------------------------------------------------------------------------- - -# Update the VARIANT arg in devcontainer.json to pick a Python version: 3, 3.8, 3.7, 3.6 -# To fully customize the contents of this image, use the following Dockerfile instead: -# https://github.com/microsoft/vscode-dev-containers/tree/v0.109.0/containers/python-3/.devcontainer/base.Dockerfile -ARG VARIANT=3 +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/python-3/.devcontainer/base.Dockerfile +ARG VARIANT="3" FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} -# [Optional] If your requirements rarely change, uncomment this section to add them to the image. -# -# COPY requirements.txt /tmp/pip-tmp/ -# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ -# && rm -rf /tmp/pip-tmp - # [Optional] Allow the vscode user to pip install globally w/o sudo ENV PIP_TARGET=/usr/local/pip-global ENV PYTHONPATH=${PIP_TARGET}:${PYTHONPATH} ENV PATH=${PIP_TARGET}/bin:${PATH} RUN mkdir -p ${PIP_TARGET} \ && chown vscode:root ${PIP_TARGET} \ - && export SNIPPET="if [ \"\$(stat -c '%U' ${PIP_TARGET})\" != \"vscode\" ]; then chown -R vscode:root ${PIP_TARGET}; fi" \ - && echo "$SNIPPET" | tee -a /root/.bashrc >> /home/vscode/.bashrc \ - && echo "$SNIPPET" | tee -a /root/.zshrc >> /home/vscode/.zshrc + && echo "if [ \"\$(stat -c '%U' ${PIP_TARGET})\" != \"vscode\" ]; then chown -R vscode:root ${PIP_TARGET}; fi" \ + | tee -a /root/.bashrc /home/vscode/.bashrc /root/.zshrc >> /home/vscode/.zshrc -# [Optional] Uncomment this section to install additional packages. -# -# ENV DEBIAN_FRONTEND=noninteractive +# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. +# COPY requirements.txt /tmp/pip-tmp/ +# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ +# && rm -rf /tmp/pip-tmp + +# [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update \ -# && apt-get -y install --no-install-recommends \ -# # -# # Clean up -# && apt-get autoremove -y \ -# && apt-get clean -y \ -# && rm -rf /var/lib/apt/lists/* -# ENV DEBIAN_FRONTEND=dialog +# && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9723584..1c77865 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,11 +1,12 @@ +// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/python-3 { - "name": "Python 3 Sample", - "context": "..", + "name": "Python 3", "build": { "dockerfile": "Dockerfile", - // Update 'VARIANT' to pick a Python version. Rebuild the container - // if it already exists to update. Available variants: 3, 3.6, 3.7, 3.8 - "args": { "VARIANT": "3.7" } + "context": "..", + // Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8 + "args": { "VARIANT": "3" } }, // Set *default* container specific settings.json values on container create.