mirror of
https://github.com/Drop-OSS/drop.git
synced 2026-09-29 16:24:09 +10:00
Fix devcontainer (#482)
Sorry, I'm just a devcontainer type of guy :D The restructure of the repo to a monorepo broke some things. I think I corrected them all so far. I had to add .pnpm-store to the root .gitignore, because the pnpm install in the container places it there. Alternatively, if that is not wanted, I could move the story via env variable afaik to another place inside the container outside of the repo.
This commit is contained in:
+2
-1
@@ -1,2 +1,3 @@
|
||||
dist/
|
||||
node_modules/
|
||||
node_modules/
|
||||
.pnpm-store/
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,15 @@
|
||||
"arktypeio.arkdark",
|
||||
"EditorConfig.EditorConfig",
|
||||
"dbaeumer.vscode-eslint"
|
||||
]
|
||||
],
|
||||
"settings": {
|
||||
"[json]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
"[jsonc]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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/**
|
||||
|
||||
Reference in New Issue
Block a user