Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dist/
node_modules/
node_modules/
.pnpm-store/
19 changes: 19 additions & 0 deletions server/.devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"features": {
"ghcr.io/devcontainers-extra/features/protoc:1": {
"version": "1.0.3",
"resolved": "ghcr.io/devcontainers-extra/features/protoc@sha256:57ec0b9c074c3c764d5b43386f5fd219586b2548d5a99da8c3307f29fc1deafc",
"integrity": "sha256:57ec0b9c074c3c764d5b43386f5fd219586b2548d5a99da8c3307f29fc1deafc"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "1.7.1",
"resolved": "ghcr.io/devcontainers/features/node@sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6",
"integrity": "sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6"
},
"ghcr.io/devcontainers/features/rust:1": {
"version": "1.5.1",
"resolved": "ghcr.io/devcontainers/features/rust@sha256:f7afd923fd283db88ca961342ae65ea63a8c95bcf86e42c4c363f43bc4ba26a5",
"integrity": "sha256:f7afd923fd283db88ca961342ae65ea63a8c95bcf86e42c4c363f43bc4ba26a5"
}
}
}
16 changes: 12 additions & 4 deletions server/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
"arktypeio.arkdark",
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint"
]
],
"settings": {
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
},

Expand All @@ -42,11 +50,11 @@
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "git submodule update --init --recursive",
"postStartCommand": "pnpm install && pnpm prisma migrate deploy && cd torrential && cargo build --release && cd ..",
"postCreateCommand": "sudo apt-get update && sudo apt-get install -y --no-install-recommends pkg-config libarchive-dev",
"postStartCommand": "pnpm install && pnpm prisma migrate deploy && cd ../torrential && cargo build --release && cd ../server",

"runServices": ["db", "app"],
"service": "app",
"shutdownAction": "stopCompose",
"workspaceFolder": "/workspaces/drop"
"workspaceFolder": "/workspaces/drop/server"
}
2 changes: 1 addition & 1 deletion server/.devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
image: mcr.microsoft.com/devcontainers/base:noble
command: sleep infinity
volumes:
- ..:/workspaces/drop:cached
- ../..:/workspaces/drop:cached
depends_on:
db:
condition: service_healthy
Expand Down
2 changes: 2 additions & 0 deletions server/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
drop-base/
# file is fully managed by pnpm, no reason to break it
pnpm-lock.yaml
# file is managed by vscode
.devcontainer/devcontainer-lock.json

/torrential/
.data/**
Expand Down
Loading