Finish packaging and change to src-based packaging layout, replace caddy with haproxy for performance, and update docker-compose and Dockerfiles for new packaging.
This commit is contained in:
parent
959b06c425
commit
762361a21b
210 changed files with 235 additions and 168 deletions
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
|
|
@ -9,7 +9,7 @@
|
|||
"args": ["runserver"],
|
||||
"django": true,
|
||||
"justMyCode": true,
|
||||
"preLaunchTask": "Run db"
|
||||
"preLaunchTask": "Run db standalone"
|
||||
}
|
||||
]
|
||||
}
|
||||
20
.vscode/tasks.json
vendored
20
.vscode/tasks.json
vendored
|
|
@ -8,15 +8,21 @@
|
|||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Run app & db (db in docker)",
|
||||
"label": "Build & run app",
|
||||
"type": "shell",
|
||||
"command": "./scripts/entrypoint.sh",
|
||||
"command": "docker compose up --build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Run app & db (both in Docker)",
|
||||
"label": "Build & run app (no build cache)",
|
||||
"type": "shell",
|
||||
"command": "docker compose -f docker-compose_entire_app.yml up",
|
||||
"command": "docker compose up --build --no-cache",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Run db standalone",
|
||||
"type": "shell",
|
||||
"command": "docker compose up -d db",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
|
|
@ -24,12 +30,6 @@
|
|||
"type": "shell",
|
||||
"command": "cd theme/static_src && npm run dev",
|
||||
"problemMatcher": [],
|
||||
},
|
||||
{
|
||||
"label": "Run db",
|
||||
"type": "shell",
|
||||
"command": "docker compose -f docker-compose_db_only.yml up",
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue