Skip to content

Commit f5ca7d7

Browse files
Revert "add supervisord to keep processes alive" (#32)
Reverts #30
1 parent 0a8061a commit f5ca7d7

4 files changed

Lines changed: 12 additions & 44 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
// Runs automatically after Prebuild Template environment is created.
1010
"onCreateCommand": ".devcontainer/onCreate.sh",
1111
// Runs automatically every time the dev container has been (re-)started
12-
"postStartCommand": ".devcontainer/postStartCommand.sh",
12+
"postStartCommand": {
13+
"tools": ".devcontainer/postStartCommand.sh",
14+
"welcome-mat": "echo Welcome to Spark!"
15+
},
1316
"customizations": {
1417
"codespaces": {
1518
"onStopCommand": "REVISION_NAME=spark-preview /usr/local/bin/deploy.sh"

.devcontainer/onCreate.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
2626

2727
echo "Pre-starting the server and generating the optimized assets"
2828
npm run optimize --override
29-
30-
echo "Installing supervisor"
31-
sudo apt update && sudo apt install -y supervisor

.devcontainer/postStartCommand.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
44
"$SCRIPT_DIR/refreshTools.sh"
55

6-
sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
6+
USE_DESIGNER=true USE_SPARK_AGENT=true npm run dev &
7+
proxy.js &
8+
spark-server &
9+
spark-agent &
10+
spark-designer &
11+
spark-file-syncer 13000 >> /tmp/.spark-file-syncer.log 2>&1 &
712

8-
sudo service supervisor start
9-
sudo supervisorctl reread
10-
sudo supervisorctl update
13+
echo "Spark tools started successfully"
1114

15+
wait

.devcontainer/spark.conf

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)