diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fce9abb..3a16838 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,21 +1,25 @@ { - "name": "Django Time Tracker", - "dockerFile": "Dockerfile", - "customizations": { - "vscode": { - "settings": { - "python.pythonPath": "/usr/local/bin/python", - "python.defaultInterpreterPath": "/usr/local/bin/python", - "terminal.integrated.defaultProfile.linux": "bash" - }, - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance", - "ms-azuretools.vscode-docker" - ] - } - }, - "forwardPorts": [8000], - "postCreateCommand": "poetry install && poetry run python manage.py migrate", - "remoteUser": "vscode" - } + "name": "Django Time Tracker", + "dockerFile": "../devcontainer.Dockerfile", + "customizations": { + "vscode": { + "settings": { + "python.pythonPath": "/usr/local/bin/python", + "python.defaultInterpreterPath": "/usr/local/bin/python", + "terminal.integrated.defaultProfile.linux": "bash" + }, + "extensions": [ + "ms-python.python", + "ms-python.debugpy", + "ms-python.vscode-pylance", + "ms-azuretools.vscode-docker", + "batisteo.vscode-django", + "charliermarsh.ruff", + "bradlc.vscode-tailwindcss", + "EditorConfig.EditorConfig" + ] + } + }, + "forwardPorts": [8000], + "postCreateCommand": "poetry install && poetry run python manage.py migrate && npm install && make dev", +} diff --git a/devcontainer.Dockerfile b/devcontainer.Dockerfile index 0215e3b..41467b8 100644 --- a/devcontainer.Dockerfile +++ b/devcontainer.Dockerfile @@ -5,7 +5,10 @@ ENV PYTHONUNBUFFERED=1 WORKDIR /workspace # Install Poetry -RUN apt-get update && apt-get install -y curl \ +RUN apt-get update && apt-get install -y \ + curl \ + make \ + npm \ && rm -rf /var/lib/apt/lists/* RUN curl -sSL https://install.python-poetry.org | python3 - ENV PATH="/root/.local/bin:$PATH"