diff --git a/archive/.devcontainer/Dockerfile b/archive/.devcontainer/Dockerfile deleted file mode 100644 index f374dbc..0000000 --- a/archive/.devcontainer/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1 - -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends postgresql-client \ - && cargo install sea-orm-cli cargo-insta \ - && chown -R vscode /usr/local/cargo - -COPY .env /.env diff --git a/archive/.devcontainer/devcontainer.json b/archive/.devcontainer/devcontainer.json deleted file mode 100644 index f85ac5a..0000000 --- a/archive/.devcontainer/devcontainer.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "Konobangu Recorder", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", - "forwardPorts": [5001] -} diff --git a/archive/.devcontainer/docker-compose.yml b/archive/.devcontainer/docker-compose.yml deleted file mode 100644 index 3d88874..0000000 --- a/archive/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,40 +0,0 @@ -version: "3" - -services: - app: - build: - context: . - dockerfile: Dockerfile - command: sleep infinity - networks: - - db - - redis - volumes: - - ../..:/workspaces:cached - env_file: - - .env - db: - image: postgres:15.3-alpine - restart: unless-stopped - ports: - - 5432:5432 - networks: - - db - volumes: - - postgres-data:/var/lib/postgresql/data - env_file: - - .env - redis: - image: redis:latest - restart: unless-stopped - ports: - - 6379:6379 - networks: - - redis - -volumes: - postgres-data: - -networks: - db: - redis: diff --git a/bacon.toml b/bacon.toml deleted file mode 100644 index 5e7991a..0000000 --- a/bacon.toml +++ /dev/null @@ -1,10 +0,0 @@ -env.CARGO_TERM_COLOR = "always" - -[jobs.recorder] -command = ["cargo", "run", "-p", "recorder", "--bin", "recorder_cli", "--", "--environment", "development"] -watch = ["apps/recorder"] -need_stdout = true -allow_warnings = true -background = false -on_change_strategy = "kill_then_restart" -kill = ["kill", "-s", "INT"] \ No newline at end of file diff --git a/dev.kdl b/dev.kdl new file mode 100644 index 0000000..503d919 --- /dev/null +++ b/dev.kdl @@ -0,0 +1,30 @@ +on_force_close "quit" + +layout { + default_tab_template { + pane size=1 borderless=true { + plugin location="zellij:tab-bar" + } + children + } + tab name="WebUI" { + pane command="pnpm" { + args "run" "--filter=webui" "dev" + } + } + tab name="Proxy" { + pane command="pnpm" { + args "run" "--filter=proxy" "dev" + } + } + tab name="Recorder" { + pane command="cargo" { + args "watch" "-w" "apps/recorder" "-x" "run -p recorder --bin recorder_cli -- --environment development" + } + } + tab name="Deps" { + pane command="docker" { + args "compose" "-f" "devdeps.compose.yaml" "up" + } + } +} \ No newline at end of file diff --git a/devdeps.compose.yaml b/devdeps.compose.yaml new file mode 100644 index 0000000..d30fc30 --- /dev/null +++ b/devdeps.compose.yaml @@ -0,0 +1,14 @@ +services: + postgres: + image: postgres:17 + environment: + POSTGRES_USER: konobangu + POSTGRES_PASSWORD: konobangu + POSTGRES_DB: konobangu + ports: + - "5432:5432" + volumes: + - postgres_data:/var/lib/postgresql/data + +volumes: + postgres_data: diff --git a/justfile b/justfile index 3bbe984..aaa2db9 100644 --- a/justfile +++ b/justfile @@ -14,3 +14,12 @@ dev-proxy: # bacon recorder # crash on windows dev-recorder: cargo watch -w "apps/recorder" -x "run -p recorder --bin recorder_cli -- --environment development" + +dev-deps: + docker compose -f devdeps.compose.yaml up + +dev-deps-clean: + docker compose -f devdeps.compose.yaml down -v + +dev-all: + zellij --layout dev.kdl \ No newline at end of file