From bb21e9bd7e90df003248b03dbf0da99a84f350c7 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Sun, 25 Dec 2022 07:04:25 -0800 Subject: [PATCH] pm2 support --- package.json | 6 +++++- packages/daemon/package.json | 9 ++++----- packages/pockethost.io/package.json | 1 + packages/proxy/package.json | 3 ++- readme.md | 7 +------ scripts/pm2.sh | 7 +++++++ 6 files changed, 20 insertions(+), 13 deletions(-) create mode 100755 scripts/pm2.sh diff --git a/package.json b/package.json index ad6a4de0..5347f531 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,10 @@ "start:proxy": "cd packages/proxy && yarn start", "start:www": "cd packages/pockethost.io && yarn start", "start:daemon": "cd packages/daemon && yarn start", + "pm2": "concurrently 'yarn:pm2:*'", + "pm2:proxy": "cd packages/proxy && yarn pm2", + "pm2:www": "cd packages/pockethost.io && yarn pm2", + "pm2:daemon": "cd packages/daemon && yarn pm2", "migrate": "yarn migrate:daemon", "migrate:daemon": "cd packages/daemon && yarn migrate", "postinstall": "patch-package" @@ -48,4 +52,4 @@ "dependencies": { "postinstall-postinstall": "^2.1.0" } -} +} \ No newline at end of file diff --git a/packages/daemon/package.json b/packages/daemon/package.json index 6b9de32c..310d3821 100644 --- a/packages/daemon/package.json +++ b/packages/daemon/package.json @@ -6,6 +6,7 @@ "build": "echo 'Build complete' `date`", "dev": "DEBUG=1 tsx watch src/server.ts", "start": "tsx src/server.ts", + "pm2": "pm2 del daemon && pm2 start \"yarn start\" --name=daemon", "migrate": "tsx src/migrate/migrate.ts" }, "dependencies": { @@ -13,23 +14,21 @@ "@s-libs/micro-dash": "^14.1.0", "@types/http-proxy": "^1.17.9", "@types/node": "^18.11.9", + "@types/tmp": "^0.2.1", "ajv": "^8.11.2", "boolean": "^3.2.0", "bottleneck": "^2.19.5", "date-fns": "^2.29.3", "event-source-polyfill": "^1.0.31", + "eventsource": "^2.0.2", "get-port": "^6.1.2", "http-proxy": "^1.18.1", "knex": "^2.3.0", "node-fetch": "^3.2.10", "pocketbase": "^0.8.0", "sqlite3": "^5.1.2", - "type-fest": "^3.3.0", - "eventsource": "^2.0.2", "tmp": "^0.2.1", - "@types/tmp": "^0.2.1" - }, - "devDependencies": { + "type-fest": "^3.3.0", "tsx": "^3.11.0" } } \ No newline at end of file diff --git a/packages/pockethost.io/package.json b/packages/pockethost.io/package.json index 78e9f853..74cb1d61 100644 --- a/packages/pockethost.io/package.json +++ b/packages/pockethost.io/package.json @@ -11,6 +11,7 @@ "lint": "prettier --check .", "format": "prettier --write .", "start": "HOST=localhost PORT=5173 node dist-server/index.js", + "pm2": "pm2 del www && pm2 start \"yarn start\" --name=www", "watch": "chokidar 'src/**' -c 'yarn build' --initial" }, "devDependencies": { diff --git a/packages/proxy/package.json b/packages/proxy/package.json index 0f79279b..71ac78ff 100644 --- a/packages/proxy/package.json +++ b/packages/proxy/package.json @@ -5,7 +5,8 @@ "license": "MIT", "scripts": { "dev": "tsx watch src/index.ts", - "start": "tsx src/index.ts" + "start": "tsx src/index.ts", + "pm2": "pm2 del proxy && pm2 start \"yarn start\" --name=proxy" }, "dependencies": { "@types/node": "^18.11.17", diff --git a/readme.md b/readme.md index ac81c655..a5d63af7 100644 --- a/readme.md +++ b/readme.md @@ -114,6 +114,7 @@ Then, ensure keys named `fullchain.pem` and `privkey.key` are in `docker/mount/n **3. Run** ```bash +sudo scripts/pm2.sh sudo open https://pockethost.io ``` @@ -126,12 +127,6 @@ If all goes well: - If major release, create announcement on PocketBase forum - Use `yarn version --patch` for patch release and tag with git -**5. Prod Run** - -```bash -nohup docker compose -f docker/prod.yaml up --remove-orphans & -``` - # Release History **next** diff --git a/scripts/pm2.sh b/scripts/pm2.sh new file mode 100755 index 00000000..a0e49e7c --- /dev/null +++ b/scripts/pm2.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -a +source .env +set +a + +yarn pm2 \ No newline at end of file