diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 68683df5..00000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dockerComposeFile": [ - "../docker-compose.yml" - ], - "service": "fab", - "shutdownAction": "none", - "workspaceFolder": "/fab", - "customizations": { - "vscode": { - "extensions": [ - "ms-python.debugpy", - "ms-python.vscode-pylance", - "eamodio.gitlens", - "ms-python.black-formatter", - "ms-python.flake8" - ] - } - }, -} diff --git a/.devcontainer/python-container/devcontainer.json b/.devcontainer/python-container/devcontainer.json deleted file mode 100644 index 23dc7240..00000000 --- a/.devcontainer/python-container/devcontainer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "Python Container", - "dockerComposeFile": [ - "../../docker-compose.yml", - "../../compose.override.yml" - ], - "service": "fab", - "shutdownAction": "none", - "workspaceFolder": "/fab", - "customizations": { - "vscode": { - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance", - "ms-python.debugpy", - "ms-python.black-formatter", - "ms-python.isort", - "monosans.djlint", - "eamodio.gitlens", - "njpwerner.autodocstring" - ] - } - } - } diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 87ca053a..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Python Debugger: Current File", - "type": "debugpy", - "request": "launch", - "env": { - "FLASK_ENV": "development" - }, - "program": "${file}", - "console": "integratedTerminal" - }, - { - "name": "Python Debugger: Flask", - "type": "debugpy", - "request": "launch", - "module": "flask", - "env": { - "FLASK_APP": "app", - "FLASK_DEBUG": "1" - }, - "args": ["run", "--debug"], - "jinja": true, - "autoStartBrowser": false - }, - { - "name": "Docker Runner FAB", - "type": "debugpy", - "env": { - "FLASK_APP": "app.app.py", - "FLASK_DEBUG": "1" - }, - "request": "attach", - "connect": { - "host": "localhost", - "port": 5696 - }, - "pathMappings": [ - { - "localRoot": "${workspaceFolder:funding-service-design-fund-application-builder}", - "remoteRoot": "." - } - ], - "justMyCode": true - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7d63977d..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "workbench.colorCustomizations": { - "titleBar.activeBackground": "#bf4bb7", - "titleBar.activeForeground": "#fdfbfb", - }, - "python.testing.pytestArgs": [ - "tests" - ], - "python.testing.unittestEnabled": false, - "python.testing.pytestEnabled": true, - "editor.quickSuggestions": { - "other": true, - "comments": false, - "strings": false - }, - "editor.quickSuggestionsDelay": 10, - "sonarlint.connectedMode.project": { - "connectionId": "communitiesuk", - "projectKey": "communitiesuk_funding-service-design-fund-application-builder" - }, -} diff --git a/compose.override.yml b/compose.override.yml deleted file mode 100644 index d6dd175a..00000000 --- a/compose.override.yml +++ /dev/null @@ -1,4 +0,0 @@ -services: - fab-db: - ports: - - 5434:5432 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml deleted file mode 100644 index 32e54d43..00000000 --- a/docker-compose-dev.yml +++ /dev/null @@ -1,61 +0,0 @@ -services: - fab-dc: - hostname: fab-dc - container_name: fab-dc - build: - context: ../funding-service-design-fund-application-builder - dockerfile: Dockerfile - args: - - USE_DEV_REQUIREMENTS=true - volumes: - - ./:/app - command: ["sh", "-c", "python -m flask db upgrade && python -m debugpy --listen 0.0.0.0:5601 -m flask run --no-debugger --host 0.0.0.0 --port 8080"] - ports: - - 8080:8080 - - 5696:5601 - environment: - - FORM_RUNNER_INTERNAL_HOST=http://form-runner-dc:3009 - - FORM_RUNNER_EXTERNAL_HOST=http://localhost:3019 - - DATABASE_URL=postgresql://postgres:password@fab-db-dc:5432/fund_builder # pragma: allowlist secret - - FLASK_DEBUG=1 - - FLASK_ENV=development - - SECRET_KEY=local - depends_on: [fab-db-dc, form-runner-dc] - - fab-db-dc: - image: postgres@sha256:fe4efc6901dda0d952306fd962643d8022d7bb773ffe13fe8a21551b9276e50c - container_name: fab-db-dc - ports: - - 5435:5432 - volumes: - - ~/apps/postgres:/var/lib/postgresql/data-fab - environment: - - POSTGRES_PASSWORD=password - - POSTGRES_DB=fund_builder - - form-runner-dc: - container_name: form-runner-dc - build: - context: ../digital-form-builder-adapter - dockerfile: ./runner/Dockerfile - ports: - - "3019:3009" - - 9238:9228 - command: yarn runner dev - environment: - - CHOKIDAR_USEPOLLING=true - - PREVIEW_MODE=true - - LAST_COMMIT - - LAST_TAG - - JWT_AUTH_ENABLED=false - - LOG_LEVEL=debug - - 'NODE_CONFIG={"safelist": ["fab"]}' - - PREVIEW_MODE=true - - NODE_ENV=development - - SINGLE_REDIS=true - - FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI=redis://redis-data:6379 - - redis-data: - image: redis@sha256:ea96c435dc17b011f54c6a883c3c45e7726242b075de61c6fe40a10ae6ae0f83 - ports: - - 6379:6379 diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index d63009c9..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -services: - fab: - build: - context: . - args: - - USE_DEV_REQUIREMENTS=true - volumes: - - .:/fab:cached - command: sleep infinity - environment: - - DATABASE_URL=postgresql://postgres:password@fab-db:5432/fab - - SECRET_KEY=local - - FLASK_ENV=development - - - fab-db: - image: postgres@sha256:fe4efc6901dda0d952306fd962643d8022d7bb773ffe13fe8a21551b9276e50c - environment: - - POSTGRES_PASSWORD=password