Skip to content

Commit bab1830

Browse files
tMerge branch 'main' into staging
2 parents 0210b8f + 59e1f31 commit bab1830

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"cpus": 4
88
},
99
// Runs automatically after Prebuild Template environment is created.
10-
"onCreateCommand": ".devcontainer/onCreate.sh",
10+
"onCreateCommand": "bash .devcontainer/onCreate.sh",
1111
// Runs automatically every time the dev container has been (re-)started
12-
"postStartCommand": ".devcontainer/postStartCommand.sh",
12+
"postStartCommand": "bash .devcontainer/postStartCommand.sh",
1313
"customizations": {
1414
"codespaces": {
15-
"onStopCommand": "shutdown.sh"
15+
"onStopCommand": "bash shutdown.sh"
1616
}
1717
},
1818
"forwardPorts": [

.devcontainer/postStartCommand.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
4-
"$SCRIPT_DIR/refreshTools.sh"
4+
bash "$SCRIPT_DIR/refreshTools.sh"
55

66
# Check if SNAPSHOT_SAS_URL was passed, if so run hydrate.sh
77
if [ -n "$SNAPSHOT_SAS_URL" ]; then

.devcontainer/refreshTools.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ sudo mv ./spark-sdk-dist/deploy.sh /usr/local/bin/deploy.sh
4141
sudo mv ./spark-sdk-dist/shutdown.sh /usr/local/bin/shutdown.sh
4242
sudo mv ./spark-sdk-dist/hydrate.sh /usr/local/bin/hydrate.sh
4343
sudo mv ./spark-sdk-dist/file-syncer.js /usr/local/bin/spark-file-syncer
44-
sudo mv ./spark-sdk-dist/spark-agent.js /usr/local/bin/spark-agent
4544
sudo cp ./spark-sdk-dist/proxy.js /workspaces/proxy.js
4645
sudo mv ./spark-sdk-dist/proxy.js /usr/local/bin/proxy.js
4746
sudo mv ./spark-sdk-dist/spark.package.json /workspaces/spark.package.json

.devcontainer/spark.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[supervisord]
22
user=node
3+
logfile=/var/log/supervisord.log
34

45
[program:vite]
56
command=npm run dev -- --debug

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ dist-ssr
2828
**/agent-eval-report*
2929
packages
3030
.file-manifest
31+
.devcontainer/

0 commit comments

Comments
 (0)