Compare commits
14 Commits
main
...
96385d85a8
| Author | SHA1 | Date | |
|---|---|---|---|
| 96385d85a8 | |||
| f438d2cd7a | |||
| 3cea9cf789 | |||
| db2c67747d | |||
| 02a353a80c | |||
| 2e71f37d48 | |||
| c23ffed003 | |||
| 9cd826bed2 | |||
| d44070f892 | |||
| dd8e9071ed | |||
| dd2606b27d | |||
| 3034faafae | |||
| 70596445a6 | |||
| 5c682041e0 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -25,4 +25,6 @@ dist/
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
.MAIN-APP-REFERENCE/
|
||||
.MAIN-APP-REFERENCE/
|
||||
|
||||
.project-vesper-plan.md
|
||||
@@ -1,5 +1,17 @@
|
||||
FROM python:3.11-slim
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
git \
|
||||
curl \
|
||||
&& curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz \
|
||||
| tar -xz --strip-components=1 -C /usr/local/bin docker/docker \
|
||||
&& curl -fsSL "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64" \
|
||||
-o /usr/local/bin/docker-compose \
|
||||
&& chmod +x /usr/local/bin/docker-compose \
|
||||
&& mkdir -p /usr/local/lib/docker/cli-plugins \
|
||||
&& ln -s /usr/local/bin/docker-compose /usr/local/lib/docker/cli-plugins/docker-compose \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY requirements.txt .
|
||||
|
||||
@@ -43,7 +43,13 @@ async def deploy(request: Request):
|
||||
logger.info("Auto-deploy triggered via Gitea webhook")
|
||||
|
||||
project_path = settings.deploy_project_path
|
||||
cmd = f"cd {project_path} && git pull origin main && docker compose up -d --build"
|
||||
cmd = (
|
||||
f"git config --global --add safe.directory {project_path} && "
|
||||
f"cd {project_path} && "
|
||||
f"git fetch origin main && "
|
||||
f"git reset --hard origin/main && "
|
||||
f"docker-compose up -d --build"
|
||||
)
|
||||
try:
|
||||
proc = await asyncio.create_subprocess_shell(
|
||||
cmd,
|
||||
|
||||
@@ -10,6 +10,9 @@ services:
|
||||
- ./data/built_melodies:/app/storage/built_melodies
|
||||
- ./data/firmware:/app/storage/firmware
|
||||
- ./data/firebase-service-account.json:/app/firebase-service-account.json:ro
|
||||
# Auto-deploy: project root and Docker socket
|
||||
- /home/bellsystems/bellsystems-cp:/home/bellsystems/bellsystems-cp
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
ports:
|
||||
- "8000:8000"
|
||||
depends_on: []
|
||||
|
||||
@@ -12,7 +12,7 @@ export default function Header() {
|
||||
}}
|
||||
>
|
||||
<h2 className="text-lg font-semibold" style={{ color: "var(--text-heading)" }}>
|
||||
BellSystems - Control Panel
|
||||
BellCloud™ - Console 2
|
||||
</h2>
|
||||
|
||||
<div className="flex items-center gap-4">
|
||||
|
||||
@@ -7,6 +7,7 @@ export default defineConfig({
|
||||
server: {
|
||||
host: '0.0.0.0',
|
||||
port: 5173,
|
||||
allowedHosts: ['console.bellsystems.net'],
|
||||
hmr: {
|
||||
clientPort: 80,
|
||||
},
|
||||
|
||||
@@ -3,6 +3,8 @@ events {
|
||||
}
|
||||
|
||||
http {
|
||||
client_max_body_size 10m;
|
||||
|
||||
upstream backend {
|
||||
server backend:8000;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user