From 8c99d6e97547c4201af7421ac14cf4f0657f0eb5 Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 21 Feb 2026 18:25:57 +0000 Subject: [PATCH] prepnutie na docker-compose --- .devcontainer/devcontainer.json | 109 +++++++++++++++++--------------- 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9218046..99b30e3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,53 +1,60 @@ { - "name": "Python Dev", - "containerEnv": { - "PIP_INDEX_URL": "https://dv.masara.eu/repository/pypi-group/simple", - "PIP_ROOT_USER_ACTION": "ignore" - }, - "remoteEnv": { - "DOCKER_BUILDKIT": "1", - "VIRTUAL_ENV": "/workspace/.venv", - "PATH": "/workspace/.venv/bin:${containerEnv:PATH}" - }, - "workspaceFolder": "/workspace", - "remoteUser": "root", - "overrideCommand": true, - "customizations": { - "vscode": { - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance", - "ms-toolsai.jupyter", - "ms-python.black-formatter", - "ms-python.isort", - "ms-azuretools.vscode-docker", - "openai.chatgpt" - ], - "settings": { - "python.formatting.provider": "black", - "python.analysis.extraPaths": [ - "${workspaceFolder}/app" - ], - "editor.formatOnSave": true, - "python.terminal.activateEnvironment": true, - "python.defaultInterpreterPath": ".venv/bin/python", - "remote.restoreForwardedPorts": false, - "remote.autoForwardPortsSource": "output", - "debug.javascript.autoAttachFilter": "disabled" - } - } - }, - "mounts": [ - "type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock", - "type=bind,source=${localEnv:USERPROFILE}/.codex,target=/root/.codex" - ], - "postCreateCommand": "bash .devcontainer/post_create.sh", - "forwardPorts": [], - "portsAttributes": { - "*": { - "onAutoForward": "ignore" - } - }, - "image": "docker.masara.eu/python:3.13-0.1-devcontainer", - "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached" + "name": "Python Dev", + "dockerComposeFile": "docker-compose.yml", + "service": "dev", + "containerEnv": { + "PIP_INDEX_URL": "https://dv.masara.eu/repository/pypi-group/simple", + "PIP_ROOT_USER_ACTION": "ignore" + }, + "remoteEnv": { + "DOCKER_BUILDKIT": "1", + "VIRTUAL_ENV": "/workspace/.venv", + "PATH": "/workspace/.venv/bin:${containerEnv:PATH}" + }, + "workspaceFolder": "/workspace", + "remoteUser": "root", + "overrideCommand": true, + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "ms-python.vscode-pylance", + "ms-python.autopep8", + "ms-toolsai.jupyter", + "ms-python.black-formatter", + "ms-python.isort", + "codezombiech.gitignore", + "davidanson.vscode-markdownlint", + "ms-azuretools.vscode-docker", + "docker.docker", + "openai.chatgpt", + "continue.continue" + ], + "settings": { + "python.formatting.provider": "black", + "python.analysis.extraPaths": [ + "${workspaceFolder}/app" + ], + "editor.formatOnSave": true, + "python.terminal.activateEnvironment": true, + "python.defaultInterpreterPath": ".venv/bin/python", + "remote.restoreForwardedPorts": false, + "remote.autoForwardPortsSource": "output", + "debug.javascript.autoAttachFilter": "disabled" + } + } + }, + "mounts": [ + "type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock", + "type=volume,source=docextractor-codex,target=/root/.codex", + "type=bind,source=${localEnv:USERPROFILE}/.codex/auth.json,target=/root/.codex/auth.json,readonly", + "type=bind,source=${localEnv:USERPROFILE}/.pypirc,target=/root/.pypirc,readonly" + ], + "postCreateCommand": "bash .devcontainer/post_create.sh", + "forwardPorts": [], + "portsAttributes": { + "*": { + "onAutoForward": "ignore" + } + } }