diff --git a/.devcontainer/build/devcontainer.json b/.devcontainer/build/devcontainer.json index b71924f..510791a 100755 --- a/.devcontainer/build/devcontainer.json +++ b/.devcontainer/build/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Kredens Dev Container", + "name": "Kredens Prebuilt Dev Container", "build": { "dockerfile": "../../dockerfiles/devcontainer.dockerfile", "context": "../.." diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a427d24..1cfe5a0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,10 @@ { + "name": "Kredens Dev Environment", "dockerComposeFile": "./docker-compose.devcontainer.yml", "service": "dev", - "workspaceFolder": "/workspaces/kredens" + "workspaceFolder": "/workspaces/kredens", + "remoteEnv": { + "COMPOSE_PROJECT_NAME": "kredens_devcontainer", + "COMPOSE_FILE": "${containerWorkspaceFolder}/.devcontainer/docker-compose.devcontainer.yml" + } } \ No newline at end of file diff --git a/package.json b/package.json index cad6714..846138b 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,13 @@ "private": true, "version": "0.0.1", "type": "module", - "license":"AGPL-3.0", + "license": "AGPL-3.0", "scripts": { + "dcUp": "devcontainer up --workspace-folder .", + "dcAttach": "devcontainer exec --workspace-folder . /bin/bash -", + "dcBuild": "devcontainer build --config .devcontainer/build/devcontainer.json --workspace-folder . --image-name fullspectrumconfidence.modzero.xyz/modzero/kredens-devcontainer", + "dcPush": "npm run dcBuild -- --push", "dev": "vite dev --host --port 5173", - "devContainerBuild": "devcontainer build --config .devcontainer/build/devcontainer.json --workspace-folder . --image-name fullspectrumconfidence.modzero.xyz/modzero/kredens-devcontainer", - "devContainerBuildAndPush": "npm run devContainerBuild -- --push", "build": "vite build", "preview": "vite preview --host --port 5173", "prepare": "svelte-kit sync || echo ''", @@ -25,5 +27,8 @@ "typescript": "^5.0.0", "vite": "^6.0.0", "vitest": "^3.0.0" + }, + "dependencies": { + "@devcontainers/cli": "^0.72.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ae9b66..40a9ccc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,10 @@ settings: importers: .: + dependencies: + '@devcontainers/cli': + specifier: ^0.72.0 + version: 0.72.0 devDependencies: '@sveltejs/adapter-auto': specifier: ^4.0.0 @@ -39,6 +43,11 @@ packages: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} + '@devcontainers/cli@0.72.0': + resolution: {integrity: sha512-vDv33/I5POw1wDJmcMbOCTWd3xTk4bbVruJ9Qgr5eiLSl1OsfufN5WfeTZqgK1HeqrNqtH/xPyCKB2LXDNIv3w==} + engines: {node: ^16.13.0 || >=18.0.0} + hasBin: true + '@esbuild/aix-ppc64@0.24.2': resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==} engines: {node: '>=18'} @@ -686,6 +695,8 @@ snapshots: '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 + '@devcontainers/cli@0.72.0': {} + '@esbuild/aix-ppc64@0.24.2': optional: true