From 74e6e5d53d8c86a93854283dbd5410bdd54a2012 Mon Sep 17 00:00:00 2001 From: Artyom Savchenko Date: Tue, 6 Oct 2026 19:42:06 +0700 Subject: [PATCH] Windows development support without WSL (#11061) Signed-off-by: Artem Savchenko --- .gitattributes | 4 + README.md | 17 +++ common/config/rush/command-line.json | 40 +++--- common/scripts/bash.js | 120 ++++++++++++++++++ desktop-package/package.json | 19 ++- desktop/package.json | 24 ++-- dev/import-tool/package.json | 19 ++- dev/prod/package.json | 16 ++- dev/tool/package.json | 24 ++-- .../packages/client-query/package.json | 5 +- .../packages/cockroach/package.json | 5 +- .../communication/packages/query/package.json | 5 +- .../packages/rest-client/package.json | 5 +- .../packages/sdk-types/package.json | 5 +- .../packages/server/package.json | 5 +- .../packages/shared/package.json | 5 +- .../communication/packages/types/package.json | 5 +- foundations/net/pods/network-pod/package.json | 11 +- .../net/pods/network-tool/package.json | 14 +- pods/account/package.json | 15 ++- pods/backup/package.json | 10 +- pods/collaborator/package.json | 10 +- pods/external/package.json | 9 +- pods/front/package.json | 18 ++- pods/fulltext/package.json | 10 +- pods/link-preview/package.json | 8 +- pods/media/package.json | 8 +- pods/preview/package.json | 8 +- pods/server/package.json | 21 +-- pods/stats/package.json | 10 +- pods/workspace/package.json | 15 ++- qms-desktop-package/package.json | 19 ++- services/ai-bot/love-agent/package.json | 8 +- services/ai-bot/pod-ai-bot/package.json | 13 +- .../pod-analytics-collector/package.json | 13 +- services/backup/backup-api-pod/package.json | 10 +- services/billing/pod-billing/package.json | 10 +- .../calendar/pod-calendar-mailer/package.json | 8 +- services/calendar/pod-calendar/package.json | 8 +- services/datalake/pod-datalake/package.json | 10 +- services/export/pod-export/package.json | 10 +- services/github/pod-github/package.json | 10 +- services/gmail/pod-gmail/package.json | 8 +- services/love/package.json | 8 +- services/mail/pod-mail-worker/package.json | 8 +- services/mail/pod-mail/package.json | 8 +- .../pod-events-processor/package.json | 7 +- .../pod-notification/package.json | 8 +- services/payment/pod-payment/package.json | 10 +- services/print/pod-print/package.json | 10 +- services/process/package.json | 8 +- services/rating/package.json | 10 +- services/rekoni/package.json | 10 +- services/sign/pod-sign/package.json | 10 +- .../pod-telegram-bot/package.json | 6 +- services/telegram/pod-telegram/package.json | 8 +- services/translate/package.json | 8 +- services/worker/package.json | 13 +- 58 files changed, 496 insertions(+), 253 deletions(-) create mode 100644 common/scripts/bash.js diff --git a/.gitattributes b/.gitattributes index 79a85db5c2..2791016329 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,3 +12,7 @@ yarn.lock merge=binary # For more information, see this issue: https://github.com/microsoft/rushstack/issues/1088 # *.json linguist-language=JSON-with-Comments + +# Shell scripts are run by bash (Git Bash on Windows, see common/scripts/bash.js), +# which fails on CRLF line endings, so keep them LF regardless of core.autocrlf. +*.sh text eol=lf diff --git a/README.md b/README.md index 7f70f1127b..6f3b2f22e5 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,7 @@ For detailed information about the platform architecture, services, and their in - [UI tests](#ui-tests) - [Package publishing](#package-publishing) - [Additional testing](#additional-testing) + - [Native Windows build](#native-windows-build) - [WSL build guide](#wsl-build-guide) ## Pre-requisites @@ -325,6 +326,22 @@ node ./common/scripts/bump.js -p projectName This project is tested with BrowserStack. +## Native Windows build + +The repository can be built and run directly on Windows, without WSL. Build and run scripts are written in bash; on Windows they are executed with Git Bash through `common/scripts/bash.js`, so no extra setup is needed beyond the usual prerequisites: + +- [Git for Windows](https://git-scm.com/download/win) (it provides Git Bash). If it is installed in a non-standard location and `git` is not on `PATH`, set `GIT_BASH` to the full path of `bash.exe`, e.g. `C:\Program Files\Git\bin\bash.exe`. +- Node.js, Rush and Docker Desktop as described in [Pre-requisites](#pre-requisites). + +Run `rush` and `rushx` commands from any shell (PowerShell, cmd or Git Bash). + +Notes for contributors: + +- Do not put bash syntax (`$(...)`, `rm -rf`, `cp`, `|| true`, `>/dev/null`, single quotes) directly into `package.json` scripts: Windows runs them with `cmd.exe`. Put such a command into the `bashScripts` section of the same `package.json` and call it as `node /common/scripts/bash.js --script `. +- Call `.sh` files as `node /common/scripts/bash.js .sh [args]`, not directly. +- `.sh` files are always checked out with LF line endings (see `.gitattributes`). +- On Windows the wrapper disables Git Bash path conversion (`MSYS_NO_PATHCONV=1`), so arguments such as `UPLOAD_URL=/files` are passed as is. + ## WSL build guide This guide describes the nuances of building and running the application from source code located on your NTFS drive, which is accessible from both Windows and WSL. diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json index 8a7842b499..f041a40f0e 100644 --- a/common/config/rush/command-line.json +++ b/common/config/rush/command-line.json @@ -109,7 +109,7 @@ "summary": "Do a format and show errors after it", "description": "Do a format and show errors after it", "safeForSimultaneousRushProcesses": true, - "shellCommand": "(rush format && true) && ./common/scripts/format-show.sh" + "shellCommand": "node common/scripts/bash.js -c \"(rush format && true) && ./common/scripts/format-show.sh\"" }, { "commandKind": "phased", @@ -245,7 +245,7 @@ "summary": "Build docker with platform", "description": "Build all docker containers required for platform. Use --minified for resource-constrained dev (or rush docker:min).", "safeForSimultaneousRushProcesses": true, - "shellCommand": "./common/scripts/docker.sh" + "shellCommand": "node common/scripts/bash.js common/scripts/docker.sh" }, { "commandKind": "global", @@ -253,7 +253,7 @@ "summary": "Build and push docker images with a custom version", "description": "Allows building and pushing docker images with a manually specified version tag. Usage: rush docker:patch --version [rush-args]", "safeForSimultaneousRushProcesses": true, - "shellCommand": "./common/scripts/docker_patch.sh" + "shellCommand": "node common/scripts/bash.js common/scripts/docker_patch.sh" }, { "commandKind": "global", @@ -261,7 +261,7 @@ "summary": "Build docker with platform", "description": "use to build all docker containers required for platform", "safeForSimultaneousRushProcesses": true, - "shellCommand": "./common/scripts/docker-server.sh && rush docker:up:server" + "shellCommand": "node common/scripts/bash.js common/scripts/docker-server.sh && rush docker:up:server" }, { "commandKind": "global", @@ -269,7 +269,7 @@ "summary": "Up development build", "description": "Up development build", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev && docker compose up -d --force-recreate" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev && docker compose up -d --force-recreate\"" }, { "commandKind": "global", @@ -277,7 +277,7 @@ "summary": "Up development build", "description": "Up development build", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev && docker compose up -d --force-recreate transactor_cockroach" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev && docker compose up -d --force-recreate transactor_cockroach\"" }, { "commandKind": "global", @@ -285,7 +285,7 @@ "summary": "Build minified docker images for resource-constrained dev", "description": "Build docker images excluding optional services (hulypulse, redis, process, backup, rating, preview, link-preview, elastic, fulltext, payment, stats, print, sign, hulygun, hulykvs). Use with rush docker:up:min", "safeForSimultaneousRushProcesses": true, - "shellCommand": "./common/scripts/docker.sh --minified" + "shellCommand": "node common/scripts/bash.js common/scripts/docker.sh --minified" }, { "commandKind": "global", @@ -293,7 +293,7 @@ "summary": "Up minified development stack", "description": "Start minified docker compose (docker-compose.yaml + docker-compose.min.yaml) for resource-constrained machines", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev && docker compose -f docker-compose.yaml -f docker-compose.min.yaml up -d --force-recreate" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev && docker compose -f docker-compose.yaml -f docker-compose.min.yaml up -d --force-recreate\"" }, { "commandKind": "global", @@ -301,7 +301,7 @@ "summary": "Up extended development stack with billing + payment", "description": "Start extended docker compose (docker-compose.yaml + docker-compose.ext.yaml) with the optional billing and payment services enabled. Required env: STRIPE_API_KEY, STRIPE_WEBHOOK_SECRET, STRIPE_SUBSCRIPTION_PLANS (or POLAR_* equivalents).", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev && docker compose -f docker-compose.yaml -f docker-compose.ext.yaml up -d --force-recreate" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev && docker compose -f docker-compose.yaml -f docker-compose.ext.yaml up -d --force-recreate\"" }, { "commandKind": "global", @@ -309,7 +309,7 @@ "summary": "Up development stack with PostgreSQL", "description": "Start dev docker compose with PostgreSQL override (docker-compose.yaml + docker-compose.pg.yaml, profile=postgres)", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev && docker compose -f docker-compose.yaml -f docker-compose.pg.yaml --profile postgres up -d --force-recreate" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev && docker compose -f docker-compose.yaml -f docker-compose.pg.yaml --profile postgres up -d --force-recreate\"" }, { "commandKind": "global", @@ -317,7 +317,7 @@ "summary": "Up development build", "description": "Up development build", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev/local-mongo && docker compose -p dev up -d --force-recreate" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev/local-mongo && docker compose -p dev up -d --force-recreate\"" }, { "commandKind": "global", @@ -325,7 +325,7 @@ "summary": "Upgrade all local models", "description": "Upgrade all local models", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./dev/tool && rushx run-local upgrade -f" + "shellCommand": "node common/scripts/bash.js -c \"cd ./dev/tool && rushx run-local upgrade -f\"" }, { "commandKind": "global", @@ -341,7 +341,7 @@ "summary": "Clean tsconfig.tsbuildinfo", "description": "Clean typescript incremental cache", "safeForSimultaneousRushProcesses": true, - "shellCommand": "find .|grep tsconfig.tsbuildinfo | xargs rm | pwd" + "shellCommand": "node common/scripts/bash.js -c \"find .|grep tsconfig.tsbuildinfo | xargs rm | pwd\"" }, { "commandKind": "global", @@ -349,14 +349,14 @@ "summary": "Clean Validate cache and to validate again", "description": "Clean typescript incremental cache", "safeForSimultaneousRushProcesses": true, - "shellCommand": "find .|grep tsBuildInfoFile.info | xargs rm | pwd && rush dorevalidate" + "shellCommand": "node common/scripts/bash.js -c \"find .|grep tsBuildInfoFile.info | xargs rm | pwd && rush dorevalidate\"" }, { "commandKind": "bulk", "name": "remove-ts-types", "summary": "Clean validate types", "description": "Clean validate types", - "shellCommand": "rm -rf ./types", + "shellCommand": "node common/scripts/bash.js -c \"rm -rf ./types\"", "enableParallelism": true, "incremental": false, "ignoreDependencyOrder": true, @@ -378,7 +378,7 @@ "summary": "show model", "description": "show model", "safeForSimultaneousRushProcesses": true, - "shellCommand": "cd ./models/all && rushx show-model" + "shellCommand": "node common/scripts/bash.js -c \"cd ./models/all && rushx show-model\"" }, { "commandKind": "global", @@ -386,7 +386,7 @@ "summary": "Clean package-deps-*.json files", "description": "Clean package-deps-*.json files", "safeForSimultaneousRushProcesses": true, - "shellCommand": "find .|grep .rush/temp/package-deps_ | xargs rm" + "shellCommand": "node common/scripts/bash.js -c \"find .|grep .rush/temp/package-deps_ | xargs rm\"" }, { "commandKind": "global", @@ -394,7 +394,7 @@ "summary": "Format changed projects", "description": "Format and autofix linting issues in changed projects", "safeForSimultaneousRushProcesses": true, - "shellCommand": "./common/scripts/fast-format.sh" + "shellCommand": "node common/scripts/bash.js common/scripts/fast-format.sh" }, { "commandKind": "global", @@ -402,7 +402,7 @@ "summary": "Build desktop build", "description": "use to build all docker containers required for platform", "safeForSimultaneousRushProcesses": true, - "shellCommand": "rush package -p 20 --to desktop && cd ./desktop-package && rushx dist" + "shellCommand": "node common/scripts/bash.js -c \"rush package -p 20 --to desktop && cd ./desktop-package && rushx dist\"" }, { "commandKind": "global", @@ -410,7 +410,7 @@ "summary": "Update published dependencies", "description": "use to update published dependencies to latest versions", "safeForSimultaneousRushProcesses": true, - "shellCommand": "./common/scripts/node_modules/.bin/update-deps" + "shellCommand": "node common/scripts/bash.js -c \"./common/scripts/node_modules/.bin/update-deps\"" } ], diff --git a/common/scripts/bash.js b/common/scripts/bash.js new file mode 100644 index 0000000000..8479fb736f --- /dev/null +++ b/common/scripts/bash.js @@ -0,0 +1,120 @@ +// +// Copyright © 2026 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Runs bash scripts and bash command lines the same way on Linux, macOS and +// native Windows (via Git Bash), so the scripts themselves stay unchanged. +// +// Usage: +// node bash.js [args...] run a script file with bash +// node bash.js --script [args...] +// run package.json "bashScripts"[name] +// from the current directory; extra +// args are appended, like npm does +// node bash.js -c "" [args...] +// run a command line; extra args are +// appended. Keep the command free of +// $, ` and \ - the calling shell may +// expand them before bash sees them +// +// On Windows bash is looked up in this order: GIT_BASH env variable, the Git +// for Windows install that owns `git` on PATH, the default install folders. +// C:\Windows\System32\bash.exe (the WSL launcher) is never used. + +const fs = require('fs') +const path = require('path') +const { spawnSync, execFileSync } = require('child_process') + +function fail (message) { + console.error(`[bash.js] ${message}`) + process.exit(1) +} + +function findWindowsBash () { + const candidates = [] + if (process.env.GIT_BASH) { + if (!fs.existsSync(process.env.GIT_BASH)) { + fail(`GIT_BASH is set to "${process.env.GIT_BASH}", but the file does not exist`) + } + return process.env.GIT_BASH + } + try { + // e.g. C:/Program Files/Git/mingw64/libexec/git-core -> C:/Program Files/Git + const execPath = execFileSync('git', ['--exec-path'], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim() + const gitRoot = path.resolve(execPath, '..', '..', '..') + candidates.push(path.join(gitRoot, 'bin', 'bash.exe')) + } catch (err) { + // git is not on PATH, fall back to default locations + } + for (const base of [process.env.ProgramFiles, process.env['ProgramFiles(x86)'], process.env.ProgramW6432]) { + if (base) candidates.push(path.join(base, 'Git', 'bin', 'bash.exe')) + } + if (process.env.LOCALAPPDATA) { + candidates.push(path.join(process.env.LOCALAPPDATA, 'Programs', 'Git', 'bin', 'bash.exe')) + } + const found = candidates.find((p) => fs.existsSync(p)) + if (found === undefined) { + fail( + 'Git Bash was not found. Install Git for Windows (https://git-scm.com/download/win) ' + + 'or set GIT_BASH to the full path of bash.exe, e.g. C:\\Program Files\\Git\\bin\\bash.exe' + ) + } + return found +} + +function bashArgs (argv) { + if (argv.length === 0) { + fail('usage: node bash.js [args...] | --script [args...] | -c ""') + } + if (argv[0] === '-c') { + if (argv[1] === undefined) fail('-c expects a command') + // extra arguments (e.g. appended by rush to a global command) go to the end of the command + return ['-c', `${argv[1]} "$@"`, 'bash.js', ...argv.slice(2)] + } + if (argv[0] === '--script') { + const name = argv[1] + if (name === undefined) fail('--script expects a script name') + const pkgPath = path.join(process.cwd(), 'package.json') + let pkg + try { + pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')) + } catch (err) { + fail(`cannot read ${pkgPath}: ${err.message}`) + } + const command = pkg.bashScripts?.[name] + if (typeof command !== 'string') fail(`"bashScripts"."${name}" is not defined in ${pkgPath}`) + // "$@" appends extra arguments the same way npm/rushx append them to a script + return ['-c', `${command} "$@"`, `bashScripts:${name}`, ...argv.slice(2)] + } + return argv +} + +const isWindows = process.platform === 'win32' +const bash = isWindows ? findWindowsBash() : 'bash' +const env = { ...process.env } +if (isWindows) { + // Git Bash rewrites arguments that look like POSIX paths when it starts native + // programs (UPLOAD_URL=/files -> UPLOAD_URL=C:/Program Files/Git/files). + // Our scripts pass URLs and relative paths only, so turn this off unless the caller decided otherwise. + if (env.MSYS_NO_PATHCONV === undefined) env.MSYS_NO_PATHCONV = '1' + if (env.MSYS2_ARG_CONV_EXCL === undefined) env.MSYS2_ARG_CONV_EXCL = '*' +} + +const result = spawnSync(bash, bashArgs(process.argv.slice(2)), { stdio: 'inherit', env }) +if (result.error) fail(`failed to start ${bash}: ${result.error.message}`) +if (result.signal) { + process.kill(process.pid, result.signal) +} else { + process.exit(result.status ?? 1) +} diff --git a/desktop-package/package.json b/desktop-package/package.json index a1252377b1..f3e51858d0 100644 --- a/desktop-package/package.json +++ b/desktop-package/package.json @@ -6,11 +6,11 @@ "template": "@hcengineering/default-package", "scripts": { "_phase:package": "rushx package", - "package": "rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && echo 'done'", - "dist": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -p onTag", - "dist-local": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build", - "dist-signed": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=true NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -c.afterSign=scripts/notarize.js -p onTag", - "dist-mac-win": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build --windows --x64", + "package": "node ../common/scripts/bash.js --script package", + "dist": "node ../common/scripts/bash.js --script dist", + "dist-local": "node ../common/scripts/bash.js --script dist-local", + "dist-signed": "node ../common/scripts/bash.js --script dist-signed", + "dist-mac-win": "node ../common/scripts/bash.js --script dist-mac-win", "format": "echo done", "bump": "bump-package-version" }, @@ -112,5 +112,12 @@ "electron", "typescript", "svelte" - ] + ], + "bashScripts": { + "package": "rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && echo 'done'", + "dist": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -p onTag", + "dist-local": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build", + "dist-signed": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=true NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -c.afterSign=scripts/notarize.js -p onTag", + "dist-mac-win": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build --windows --x64" + } } diff --git a/desktop/package.json b/desktop/package.json index 4b0e9113dc..e84a618811 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -9,12 +9,12 @@ "_phase:package": "rushx package", "_phase:validate": "compile validate", "_phase:test": "jest --passWithNoTests --silent --forceExit --detectOpenHandles", - "package": "rushx bump && cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production NODE_OPTIONS='--max-old-space-size=4094' webpack --stats-error-details && echo 'done'", - "webpack": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development webpack --stats-error-details --progress -w", - "devp": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production CLIENT_TYPE=dev webpack --progress -w", - "dev": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development webpack --progress -w", - "start": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production electron --no-sandbox .", - "start-dev": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development electron --no-sandbox .", + "package": "node ../common/scripts/bash.js --script package", + "webpack": "node ../common/scripts/bash.js --script webpack", + "devp": "node ../common/scripts/bash.js --script devp", + "dev": "node ../common/scripts/bash.js --script dev", + "start": "node ../common/scripts/bash.js --script start", + "start-dev": "node ../common/scripts/bash.js --script start-dev", "test": "jest --passWithNoTests --silent --forceExit --verbose --detectOpenHandles", "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --no-cache", "format": "format", @@ -294,5 +294,13 @@ "electron", "typescript", "svelte" - ] -} \ No newline at end of file + ], + "bashScripts": { + "package": "rushx bump && cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production NODE_OPTIONS='--max-old-space-size=4094' webpack --stats-error-details && echo 'done'", + "webpack": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development webpack --stats-error-details --progress -w", + "devp": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production CLIENT_TYPE=dev webpack --progress -w", + "dev": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development webpack --progress -w", + "start": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production electron --no-sandbox .", + "start-dev": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development electron --no-sandbox ." + } +} diff --git a/dev/import-tool/package.json b/dev/import-tool/package.json index cdd2546613..2add7cdf07 100644 --- a/dev/import-tool/package.json +++ b/dev/import-tool/package.json @@ -15,13 +15,13 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --define=MODEL_VERSION --define=GIT_REVISION --sourcemap=external", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/import-tool", - "docker:tbuild": "docker build -t hardcoreeng/import-tool . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/import-tool", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/import-tool staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/import-tool", - "run-local": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --max-old-space-size=18000 ./bundle/bundle.js", - "run-local-brk": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", - "run": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env node --max-old-space-size=8000 ./bundle/bundle.js", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/import-tool", + "docker:tbuild": "docker build -t hardcoreeng/import-tool . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/import-tool", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/import-tool staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/import-tool", + "run-local": "node ../../common/scripts/bash.js --script run-local", + "run-local-brk": "node ../../common/scripts/bash.js --script run-local-brk", + "run": "node ../../common/scripts/bash.js --script run", "upgrade": "rushx run-local upgrade", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", @@ -58,5 +58,10 @@ "commander": "^14.0.0", "js-yaml": "^4.1.0", "mammoth": "^1.9.0" + }, + "bashScripts": { + "run-local": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --max-old-space-size=18000 ./bundle/bundle.js", + "run-local-brk": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", + "run": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env node --max-old-space-size=8000 ./bundle/bundle.js" } } diff --git a/dev/prod/package.json b/dev/prod/package.json index eb365cf772..b68481f17d 100644 --- a/dev/prod/package.json +++ b/dev/prod/package.json @@ -5,9 +5,9 @@ "license": "EPL-2.0", "scripts": { "_phase:package": "rushx package", - "_phase:validate": "rm -rf ./types && compile validate", - "package": "rm -rf ./dist && cross-env NODE_ENV=production webpack --stats-error-details && echo 'done'", - "analyze": "rm -rf ./dist && cross-env NODE_ENV=production webpack --profile --json > stats.json", + "_phase:validate": "node ../../common/scripts/bash.js --script _phase:validate", + "package": "node ../../common/scripts/bash.js --script package", + "analyze": "node ../../common/scripts/bash.js --script analyze", "show": "webpack-bundle-analyzer stats.json dist", "dev-server": "cross-env USE_CACHE=false CLIENT_TYPE=dev-server webpack serve", "dev-server-test": "cross-env USE_CACHE=false CLIENT_TYPE=dev-server-test webpack serve", @@ -19,7 +19,7 @@ "dev-huly": "cross-env CLIENT_TYPE=dev-huly webpack serve", "dev-bold": "cross-env CLIENT_TYPE=dev-bold webpack serve", "start": "cross-env NODE_ENV=production webpack serve", - "deploy": "cp -p public/* dist && aws s3 sync dist s3://anticrm-platform --delete --acl public-read", + "deploy": "node ../../common/scripts/bash.js --script deploy", "format": "echo 'no format yet'" }, "devDependencies": { @@ -296,5 +296,11 @@ "@hcengineering/rating-resources": "workspace:^0.7.0", "readable-stream": "^4.7.0", "svelte": "^4.2.20" + }, + "bashScripts": { + "_phase:validate": "rm -rf ./types && compile validate", + "package": "rm -rf ./dist && cross-env NODE_ENV=production webpack --stats-error-details && echo 'done'", + "analyze": "rm -rf ./dist && cross-env NODE_ENV=production webpack --profile --json > stats.json", + "deploy": "cp -p public/* dist && aws s3 sync dist s3://anticrm-platform --delete --acl public-read" } -} \ No newline at end of file +} diff --git a/dev/tool/package.json b/dev/tool/package.json index a09ae9febf..9a3fb831b8 100644 --- a/dev/tool/package.json +++ b/dev/tool/package.json @@ -15,15 +15,15 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --external=snappy --sourcemap=external --define:MODEL_VERSION --define:GIT_REVISION", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/tool", - "docker:tbuild": "docker build -t hardcoreeng/tool . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/tool", - "docker:abuild": "docker build -t hardcoreeng/tool . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/tool", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/tool staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/tool", - "run-local-mongo": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4700 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", - "run-local": "(rush bundle --to @hcengineering/tool >/dev/null || true) && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4702 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3332 STORAGE_CONFIG='datalake|http://huly.local:4030' HULYLAKE_URL=http://huly.local:8096 ACCOUNT_DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 REGION_INFO='cockroach|CockroachDB' MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 $TOOL_OPT ./bundle/bundle.js", - "run-local-brk": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", - "run": "(rush bundle --to @hcengineering/tool >/dev/null || true ) && cross-env node --max-old-space-size=8000 ./bundle/bundle.js", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/tool", + "docker:tbuild": "docker build -t hardcoreeng/tool . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/tool", + "docker:abuild": "docker build -t hardcoreeng/tool . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/tool", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/tool staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/tool", + "run-local-mongo": "node ../../common/scripts/bash.js --script run-local-mongo", + "run-local": "node ../../common/scripts/bash.js --script run-local", + "run-local-brk": "node ../../common/scripts/bash.js --script run-local-brk", + "run": "node ../../common/scripts/bash.js --script run", "upgrade-mongo": "rushx run-local-mongo upgrade-workspace -- $1", "upgrade": "rushx run-local upgrade-workspace -- $1", "upgrade-brk": "rushx run-local-brk upgrade-workspace -- $1", @@ -190,5 +190,11 @@ "@hcengineering/hulylake-client": "workspace:^0.7.18", "@hcengineering/communication-types": "workspace:^0.7.12", "@hcengineering/pod-rating": "workspace:^0.7.0" + }, + "bashScripts": { + "run-local-mongo": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4700 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", + "run-local": "(rush bundle --to @hcengineering/tool >/dev/null || true) && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4702 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3332 STORAGE_CONFIG='datalake|http://huly.local:4030' HULYLAKE_URL=http://huly.local:8096 ACCOUNT_DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 REGION_INFO='cockroach|CockroachDB' MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 $TOOL_OPT ./bundle/bundle.js", + "run-local-brk": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", + "run": "(rush bundle --to @hcengineering/tool >/dev/null || true ) && cross-env node --max-old-space-size=8000 ./bundle/bundle.js" } } diff --git a/foundations/communication/packages/client-query/package.json b/foundations/communication/packages/client-query/package.json index 79b05582c4..cb542d6c05 100644 --- a/foundations/communication/packages/client-query/package.json +++ b/foundations/communication/packages/client-query/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -55,5 +55,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/cockroach/package.json b/foundations/communication/packages/cockroach/package.json index 9e229a72f6..2661167d00 100644 --- a/foundations/communication/packages/cockroach/package.json +++ b/foundations/communication/packages/cockroach/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -57,5 +57,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/query/package.json b/foundations/communication/packages/query/package.json index e8a5bd2fd3..e4754c75e7 100644 --- a/foundations/communication/packages/query/package.json +++ b/foundations/communication/packages/query/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -57,5 +57,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/rest-client/package.json b/foundations/communication/packages/rest-client/package.json index f5490cb4ba..329c235455 100644 --- a/foundations/communication/packages/rest-client/package.json +++ b/foundations/communication/packages/rest-client/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -56,5 +56,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/sdk-types/package.json b/foundations/communication/packages/sdk-types/package.json index 4a279efb15..d9b7018a4b 100644 --- a/foundations/communication/packages/sdk-types/package.json +++ b/foundations/communication/packages/sdk-types/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -52,5 +52,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/server/package.json b/foundations/communication/packages/server/package.json index 9658964d5e..bf69d96e6c 100644 --- a/foundations/communication/packages/server/package.json +++ b/foundations/communication/packages/server/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules", + "clean": "node ../../../../common/scripts/bash.js --script clean", "test": "jest --passWithNoTests --silent --forceExit", "_phase:test": "jest --passWithNoTests --silent --forceExit" }, @@ -67,5 +67,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/shared/package.json b/foundations/communication/packages/shared/package.json index 0c3a73f428..25dfd2cccd 100644 --- a/foundations/communication/packages/shared/package.json +++ b/foundations/communication/packages/shared/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -53,5 +53,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/communication/packages/types/package.json b/foundations/communication/packages/types/package.json index 02dfcc6bf8..ad6882c2f5 100644 --- a/foundations/communication/packages/types/package.json +++ b/foundations/communication/packages/types/package.json @@ -17,7 +17,7 @@ "lint": "eslint \"src/**/*.ts\"", "lint:fix": "eslint --fix \"src/**/*.ts\"", "format": "format", - "clean": "rm -rf lib && rm -rf types rm -rf node_modules" + "clean": "node ../../../../common/scripts/bash.js --script clean" }, "devDependencies": { "@hcengineering/platform-rig": "workspace:^0.7.21", @@ -51,5 +51,8 @@ "require": "./lib/index.js", "import": "./lib/index.js" } + }, + "bashScripts": { + "clean": "rm -rf lib && rm -rf types rm -rf node_modules" } } diff --git a/foundations/net/pods/network-pod/package.json b/foundations/net/pods/network-pod/package.json index de2ee912ee..2dbd5316ba 100644 --- a/foundations/net/pods/network-pod/package.json +++ b/foundations/net/pods/network-pod/package.json @@ -13,9 +13,9 @@ "CHANGELOG.md" ], "scripts": { - "start": "rush bundle --to @hcengineering/network-pod && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 node --inspect bundle/bundle.js", - "start-cr": "rush bundle --to @hcengineering/network-pod && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 FULLTEXT_URL=http://huly.local:4702 SERVER_PORT=3332 node --inspect bundle/bundle.js", - "start-flame": "rush bundle --to @hcengineering/network-pod && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret MODEL_JSON=../../models/all/bundle/model.json clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts", + "start": "node ../../../../common/scripts/bash.js --script start", + "start-cr": "node ../../../../common/scripts/bash.js --script start-cr", + "start-flame": "node ../../../../common/scripts/bash.js --script start-flame", "start-raw": "ts-node src/__start.ts", "dev": "ts-node src/__start.ts", "build": "compile", @@ -72,5 +72,10 @@ }, "publishConfig": { "access": "public" + }, + "bashScripts": { + "start": "rush bundle --to @hcengineering/network-pod && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 node --inspect bundle/bundle.js", + "start-cr": "rush bundle --to @hcengineering/network-pod && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 FULLTEXT_URL=http://huly.local:4702 SERVER_PORT=3332 node --inspect bundle/bundle.js", + "start-flame": "rush bundle --to @hcengineering/network-pod && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret MODEL_JSON=../../models/all/bundle/model.json clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts" } } diff --git a/foundations/net/pods/network-tool/package.json b/foundations/net/pods/network-tool/package.json index 2a7a8b99f5..0ed404085b 100644 --- a/foundations/net/pods/network-tool/package.json +++ b/foundations/net/pods/network-tool/package.json @@ -13,9 +13,9 @@ "CHANGELOG.md" ], "scripts": { - "start": "rush bundle --to @hcengineering/network-tool && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 node --inspect bundle/bundle.js", - "start-cr": "rush bundle --to @hcengineering/network-tool && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 FULLTEXT_URL=http://huly.local:4702 SERVER_PORT=3332 node --inspect bundle/bundle.js", - "start-flame": "rush bundle --to @hcengineering/network-tool && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret MODEL_JSON=../../models/all/bundle/model.json clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts", + "start": "node ../../../../common/scripts/bash.js --script start", + "start-cr": "node ../../../../common/scripts/bash.js --script start-cr", + "start-flame": "node ../../../../common/scripts/bash.js --script start-flame", "start-raw": "ts-node src/__start.ts", "build": "compile", "prepublishOnly": "npm run build", @@ -28,7 +28,7 @@ "docker:abuild": "docker build -t hardcoreeng/network-tool . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/network-tool", "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/network-tool staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/network-tool", - "run": "(rushx bundle || true) && node bundle/bundle.js", + "run": "node ../../../../common/scripts/bash.js --script run", "build:watch": "compile", "format": "format src", "test": "jest --coverage --coverageDirectory=./coverage --passWithNoTests --forceExit", @@ -74,5 +74,11 @@ }, "publishConfig": { "access": "public" + }, + "bashScripts": { + "start": "rush bundle --to @hcengineering/network-tool && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 node --inspect bundle/bundle.js", + "start-cr": "rush bundle --to @hcengineering/network-tool && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 FULLTEXT_URL=http://huly.local:4702 SERVER_PORT=3332 node --inspect bundle/bundle.js", + "start-flame": "rush bundle --to @hcengineering/network-tool && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret MODEL_JSON=../../models/all/bundle/model.json clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts", + "run": "(rushx bundle || true) && node bundle/bundle.js" } } diff --git a/pods/account/package.json b/pods/account/package.json index e79ca0688f..97e278857a 100644 --- a/pods/account/package.json +++ b/pods/account/package.json @@ -15,12 +15,12 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --define=MODEL_VERSION --sourcemap=external --external=*.node --external=snappy", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/account", - "docker:tbuild": "docker build -t hardcoreeng/account . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/account", - "docker:abuild": "docker build -t hardcoreeng/account . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/account", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/account staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/account", - "run-local": "cross-env DB_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/account", + "docker:tbuild": "docker build -t hardcoreeng/account . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/account", + "docker:abuild": "docker build -t hardcoreeng/account . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/account", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/account staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/account", + "run-local": "node ../../common/scripts/bash.js --script run-local", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", @@ -66,5 +66,8 @@ "@hcengineering/server-core": "workspace:^0.7.19", "@hcengineering/analytics": "workspace:^0.7.19", "@hcengineering/analytics-service": "workspace:^0.7.19" + }, + "bashScripts": { + "run-local": "cross-env DB_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts" } } diff --git a/pods/backup/package.json b/pods/backup/package.json index 479d37be38..1559a46347 100644 --- a/pods/backup/package.json +++ b/pods/backup/package.json @@ -16,11 +16,11 @@ "_phase:docker-staging": "rushx docker:staging", "get-model": "node ../../common/scripts/esbuild.js --entry=src/get-model.ts --keep-names=true --bundle=true --define=MODEL_VERSION --define=VERSION --define=GIT_REVISION && node ./bundle/bundle.js > ./bundle/model.json", "bundle": "rushx get-model && node ../../common/scripts/esbuild.js --entry=src/index.ts --keep-names=true --bundle=true --sourcemap=external --external=*.node", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/backup", - "docker:tbuild": "docker build -t hardcoreeng/backup . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/backup", - "docker:abuild": "docker build -t hardcoreeng/backup . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/backup", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/backup staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/backup", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/backup", + "docker:tbuild": "docker build -t hardcoreeng/backup . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/backup", + "docker:abuild": "docker build -t hardcoreeng/backup . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/backup", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/backup staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/backup", "run-local": "cross-env ACCOUNTS_URL=http://localhost:3000/ SECRET=secret MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost BUCKET_NAME=backups INTERVAL=30 ts-node src/index.ts", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", diff --git a/pods/collaborator/package.json b/pods/collaborator/package.json index aa0e85fae7..f7dbdec9c3 100644 --- a/pods/collaborator/package.json +++ b/pods/collaborator/package.json @@ -14,11 +14,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --sourcemap=external --external=*.node --external=snappy --external=bufferutil", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/collaborator", - "docker:tbuild": "docker build -t hardcoreeng/collaborator . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator", - "docker:abuild": "docker build -t hardcoreeng/collaborator . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/collaborator staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/collaborator", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/collaborator", + "docker:tbuild": "docker build -t hardcoreeng/collaborator . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator", + "docker:abuild": "docker build -t hardcoreeng/collaborator . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/collaborator staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/collaborator", "run-local": "cross-env MONGO_URL=mongodb://localhost:27017 SECRET=secret MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin ts-node src/__start.ts", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", diff --git a/pods/external/package.json b/pods/external/package.json index 642c034af5..dfbd055c1f 100644 --- a/pods/external/package.json +++ b/pods/external/package.json @@ -5,9 +5,9 @@ "license": "EPL-2.0", "scripts": { "_phase:docker-build": "rushx docker:build", - "docker:build": "sh bin/build.sh", - "docker:push": "sh bin/push.sh", - "format": "true" + "docker:build": "node ../../common/scripts/bash.js bin/build.sh", + "docker:push": "node ../../common/scripts/bash.js bin/push.sh", + "format": "node ../../common/scripts/bash.js --script format" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^6.21.0", @@ -17,5 +17,8 @@ "eslint": "^8.54.0", "@typescript-eslint/parser": "^6.21.0", "eslint-config-standard-with-typescript": "^40.0.0" + }, + "bashScripts": { + "format": "true" } } diff --git a/pods/front/package.json b/pods/front/package.json index e3b7ddb2fb..68294c4df2 100644 --- a/pods/front/package.json +++ b/pods/front/package.json @@ -15,14 +15,14 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --define=MODEL_VERSION --define=VERSION --sourcemap=external --minify --external=sharp", - "package": "rm -rf ./dist && cp -r ../../dev/prod/dist . && cp -r ../../dev/prod/public/* ./dist/ && rm ./dist/config.json", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/front", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/front staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/front", - "docker:tbuild": "docker build -t hardcoreeng/front . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front", - "docker:abuild": "docker build -t hardcoreeng/front . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front", + "package": "node ../../common/scripts/bash.js --script package", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/front", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/front staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/front", + "docker:tbuild": "docker build -t hardcoreeng/front . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/front", + "docker:abuild": "docker build -t hardcoreeng/front . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/front", "format": "format src", - "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files MODEL_VERSION=$(node ../../common/scripts/show_version.js) VERSION=$(node ../../common/scripts/show_tag.js) PUBLIC_DIR='.' ts-node ./src/__start.ts", + "run-local": "node ../../common/scripts/bash.js --script run-local", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", "_phase:test": "jest --passWithNoTests --silent --forceExit", @@ -70,5 +70,9 @@ "sharp": "~0.34.3", "@hcengineering/analytics": "workspace:^0.7.19", "@hcengineering/analytics-service": "workspace:^0.7.19" + }, + "bashScripts": { + "package": "rm -rf ./dist && cp -r ../../dev/prod/dist . && cp -r ../../dev/prod/public/* ./dist/ && rm ./dist/config.json", + "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files MODEL_VERSION=$(node ../../common/scripts/show_version.js) VERSION=$(node ../../common/scripts/show_tag.js) PUBLIC_DIR='.' ts-node ./src/__start.ts" } } diff --git a/pods/fulltext/package.json b/pods/fulltext/package.json index 1fe66b5e39..4fedbebd53 100644 --- a/pods/fulltext/package.json +++ b/pods/fulltext/package.json @@ -16,11 +16,11 @@ "_phase:docker-staging": "rushx docker:staging", "get-model": "node ../../common/scripts/esbuild.js --entry=src/get-model.ts --keep-names=true --bundle=true --define=MODEL_VERSION --define=VERSION --define=GIT_REVISION && node ./bundle/bundle.js > ./bundle/model.json", "bundle": "rushx get-model && node ../../common/scripts/esbuild.js --keep-names=true --bundle=true --external=*.node --external=snappy --sourcemap=external", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/fulltext", - "docker:tbuild": "docker build -t hardcoreeng/fulltext . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/fulltext", - "docker:abuild": "docker build -t hardcoreeng/fulltext . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/fulltext", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/fulltext staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/fulltext", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/fulltext", + "docker:tbuild": "docker build -t hardcoreeng/fulltext . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/fulltext", + "docker:abuild": "docker build -t hardcoreeng/fulltext . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/fulltext", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/fulltext staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/fulltext", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", diff --git a/pods/link-preview/package.json b/pods/link-preview/package.json index ad0d625a7a..a4495e2b28 100644 --- a/pods/link-preview/package.json +++ b/pods/link-preview/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --keep-names=true --sourcemap=external", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/link-preview", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/link-preview staging", - "docker:abuild": "docker build -t hardcoreeng/link-preview . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/link-preview", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/link-preview", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/link-preview", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/link-preview staging", + "docker:abuild": "docker build -t hardcoreeng/link-preview . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/link-preview", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/link-preview", "run-bundle": "rushx bundle --to @hcengineering/pod-link-preview && cross-env NODE_ENV=production node --inspect bundle/bundle.js", "run-local": "ts-node src/index.ts", "format": "format src", diff --git a/pods/media/package.json b/pods/media/package.json index cddc05199d..5867a29caf 100644 --- a/pods/media/package.json +++ b/pods/media/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --external=ws", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/media", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/media staging", - "docker:abuild": "docker build -t hardcoreeng/media . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/media", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/media", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/media", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/media staging", + "docker:abuild": "docker build -t hardcoreeng/media . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/media", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/media", "run-bundle": "rushx bundle --to @hcengineering/pod-media && cross-env NODE_ENV=production node --inspect bundle/bundle.js", "run-local": "ts-node src/index.ts", "format": "format src", diff --git a/pods/preview/package.json b/pods/preview/package.json index de3633d334..cf40ec7336 100644 --- a/pods/preview/package.json +++ b/pods/preview/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --keep-names=true --sourcemap=external --external=sharp", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/preview", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/preview staging", - "docker:abuild": "docker build -t hardcoreeng/preview . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/preview", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/preview", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/preview", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/preview staging", + "docker:abuild": "docker build -t hardcoreeng/preview . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/preview", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/preview", "run-bundle": "rushx bundle --to @hcengineering/pod-preview && cross-env NODE_ENV=production node --inspect bundle/bundle.js", "run-local": "ts-node src/index.ts", "format": "format src", diff --git a/pods/server/package.json b/pods/server/package.json index 6d03450d8a..43b39112f6 100644 --- a/pods/server/package.json +++ b/pods/server/package.json @@ -8,9 +8,9 @@ "template": "@hcengineering/node-package", "license": "EPL-2.0", "scripts": { - "start": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 node --inspect bundle/bundle.js", - "start-cr": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 FULLTEXT_URL=http://huly.local:4702 SERVER_PORT=3332 node --inspect bundle/bundle.js", - "start-flame": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret MODEL_JSON=../../models/all/bundle/model.json clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts", + "start": "node ../../common/scripts/bash.js --script start", + "start-cr": "node ../../common/scripts/bash.js --script start-cr", + "start-flame": "node ../../common/scripts/bash.js --script start-flame", "start-raw": "ts-node src/__start.ts", "build": "compile", "_phase:bundle": "rushx bundle", @@ -18,11 +18,11 @@ "_phase:docker-staging": "rushx docker:staging", "get-model": "node ../../common/scripts/esbuild.js --entry=src/get-model.ts -keep-names=true --define=MODEL_VERSION --define=VERSION --define=GIT_REVISION --bundle=true && node ./bundle/bundle.js > ./bundle/model.json", "bundle": "rushx get-model && node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --bundle=true --sourcemap=external --external=*.node --external=bufferutil --external=snappy --define=MODEL_VERSION --define=VERSION --define=GIT_REVISION --external=utf-8-validate --external=msgpackr-extract", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/transactor", - "docker:tbuild": "docker build -t hardcoreeng/transactor . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", - "docker:abuild": "docker build -t hardcoreeng/transactor . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/transactor staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/transactor", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/transactor", + "docker:tbuild": "docker build -t hardcoreeng/transactor . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", + "docker:abuild": "docker build -t hardcoreeng/transactor . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/transactor staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/transactor", "build:watch": "compile", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", @@ -96,5 +96,10 @@ "body-parser": "^1.20.3", "cors": "^2.8.5", "express": "^4.21.2" + }, + "bashScripts": { + "start": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 node --inspect bundle/bundle.js", + "start-cr": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret OPERATION_PROFILING=false MODEL_JSON=../../models/all/bundle/model.json STATS_URL=http://huly.local:4900 FULLTEXT_URL=http://huly.local:4702 SERVER_PORT=3332 node --inspect bundle/bundle.js", + "start-flame": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret MODEL_JSON=../../models/all/bundle/model.json clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts" } } diff --git a/pods/stats/package.json b/pods/stats/package.json index 6d1f6ce9c6..65a22ab957 100644 --- a/pods/stats/package.json +++ b/pods/stats/package.json @@ -15,11 +15,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --sourcemap=external --define=MODEL_VERSION --external=*.node --external=snappy", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/stats", - "docker:tbuild": "docker build -t hardcoreeng/stats . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/stats", - "docker:abuild": "docker build -t hardcoreeng/stats . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/stats", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/stats staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/stats", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/stats", + "docker:tbuild": "docker build -t hardcoreeng/stats . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/stats", + "docker:abuild": "docker build -t hardcoreeng/stats . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/stats", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/stats staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/stats", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", diff --git a/pods/workspace/package.json b/pods/workspace/package.json index cb580cc48e..19f4a59c0a 100644 --- a/pods/workspace/package.json +++ b/pods/workspace/package.json @@ -15,12 +15,12 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js --entry=src/__start.ts --keep-names=true --sourcemap=external --external=*.node --define=MODEL_VERSION --external=snappy --minify=true", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/workspace", - "docker:tbuild": "docker build -t hardcoreeng/workspace . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/workspace", - "docker:abuild": "docker build -t hardcoreeng/workspace . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/workspace", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/workspace staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/workspace", - "run-local": "cross-env DB_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/workspace", + "docker:tbuild": "docker build -t hardcoreeng/workspace . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/workspace", + "docker:abuild": "docker build -t hardcoreeng/workspace . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/workspace", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/workspace staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/workspace", + "run-local": "node ../../common/scripts/bash.js --script run-local", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", @@ -58,5 +58,8 @@ "@hcengineering/analytics": "workspace:^0.7.19", "@hcengineering/analytics-service": "workspace:^0.7.19", "@hcengineering/kafka": "workspace:^0.7.18" + }, + "bashScripts": { + "run-local": "cross-env DB_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts" } } diff --git a/qms-desktop-package/package.json b/qms-desktop-package/package.json index 6f52c18295..5e8021f6d1 100644 --- a/qms-desktop-package/package.json +++ b/qms-desktop-package/package.json @@ -6,11 +6,11 @@ "template": "@hcengineering/default-package", "scripts": { "_phase:package": "rushx package", - "package": "rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && cp src/AppIcon.png ./dist/ui/public && cp src/AppIcon.ico ./dist/ui/public && echo 'done'", - "dist": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -p onTag", - "dist-local": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build", - "dist-signed": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=true NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -c.afterSign=scripts/notarize.js -p onTag", - "dist-mac-win": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build --windows --x64", + "package": "node ../common/scripts/bash.js --script package", + "dist": "node ../common/scripts/bash.js --script dist", + "dist-local": "node ../common/scripts/bash.js --script dist-local", + "dist-signed": "node ../common/scripts/bash.js --script dist-signed", + "dist-mac-win": "node ../common/scripts/bash.js --script dist-mac-win", "format": "echo done", "bump": "bump-package-version" }, @@ -121,5 +121,12 @@ "electron", "typescript", "svelte" - ] + ], + "bashScripts": { + "package": "rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && cp src/AppIcon.png ./dist/ui/public && cp src/AppIcon.ico ./dist/ui/public && echo 'done'", + "dist": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -p onTag", + "dist-local": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build", + "dist-signed": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=true NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -c.afterSign=scripts/notarize.js -p onTag", + "dist-mac-win": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build --windows --x64" + } } diff --git a/services/ai-bot/love-agent/package.json b/services/ai-bot/love-agent/package.json index ac9c2d0fa3..bd2d8b5ca3 100644 --- a/services/ai-bot/love-agent/package.json +++ b/services/ai-bot/love-agent/package.json @@ -13,8 +13,8 @@ "type": "module", "scripts": { "build": "node esbuild.config.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/love-agent", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/love-agent", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/love-agent", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/love-agent", "lint": "eslint src/**/*.ts", "lint:fix": "eslint --fix src/**/*.ts", "format": "prettier --write src/**/*.ts && pnpm lint:fix" @@ -41,6 +41,8 @@ "ws": "^8.18.2" }, "pnpm": { - "onlyBuiltDependencies": ["esbuild"] + "onlyBuiltDependencies": [ + "esbuild" + ] } } diff --git a/services/ai-bot/pod-ai-bot/package.json b/services/ai-bot/pod-ai-bot/package.json index ab66f6a68c..addede4380 100644 --- a/services/ai-bot/pod-ai-bot/package.json +++ b/services/ai-bot/pod-ai-bot/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/ai-bot", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/ai-bot staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/ai-bot", - "docker:tbuild": "rush bundle --to @hcengineering/pod-ai-bot && docker build -t hardcoreeng/ai-bot . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/ai-bot", - "run-local": "cross-env APP_ID=$(cat ../../../../uberflow_private/appid) PRIVATE_KEY=\"$(cat ../../../../uberflow_private/private-key.pem)\" CLIENT_ID=$(cat ../../../../uberflow_private/client-id) CLIENT_SECRET=$(cat ../../../../uberflow_private/client-secret) SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000/ COLLABORATOR_URL=http://localhost:3078 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ts-node src/index.ts", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/ai-bot", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/ai-bot staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/ai-bot", + "docker:tbuild": "rush bundle --to @hcengineering/pod-ai-bot && docker build -t hardcoreeng/ai-bot . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/ai-bot", + "run-local": "node ../../../common/scripts/bash.js --script run-local", "format": "format src", "_phase:build": "compile transpile src", "_phase:test": "jest --passWithNoTests --silent", @@ -93,5 +93,8 @@ "openai": "^4.56.0", "uuid": "^8.3.2", "ws": "^8.18.2" + }, + "bashScripts": { + "run-local": "cross-env APP_ID=$(cat ../../../../uberflow_private/appid) PRIVATE_KEY=\"$(cat ../../../../uberflow_private/private-key.pem)\" CLIENT_ID=$(cat ../../../../uberflow_private/client-id) CLIENT_SECRET=$(cat ../../../../uberflow_private/client-secret) SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000/ COLLABORATOR_URL=http://localhost:3078 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ts-node src/index.ts" } } diff --git a/services/analytics-collector/pod-analytics-collector/package.json b/services/analytics-collector/pod-analytics-collector/package.json index 300b2b5bbe..31e189d006 100644 --- a/services/analytics-collector/pod-analytics-collector/package.json +++ b/services/analytics-collector/pod-analytics-collector/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/analytics-collector", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/analytics-collector staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/analytics-collector", - "docker:tbuild": "rush bundle --to @hcengineering/pod-analytics-collector && docker build -t hardcoreeng/analytics-collector . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/analytics-collector", - "run-local": "cross-env APP_ID=$(cat ../../../../uberflow_private/appid) PRIVATE_KEY=\"$(cat ../../../../uberflow_private/private-key.pem)\" CLIENT_ID=$(cat ../../../../uberflow_private/client-id) CLIENT_SECRET=$(cat ../../../../uberflow_private/client-secret) SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000/ COLLABORATOR_URL=http://localhost:3078 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ts-node src/index.ts", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/analytics-collector", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/analytics-collector staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/analytics-collector", + "docker:tbuild": "rush bundle --to @hcengineering/pod-analytics-collector && docker build -t hardcoreeng/analytics-collector . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/analytics-collector", + "run-local": "node ../../../common/scripts/bash.js --script run-local", "format": "format src", "_phase:build": "compile transpile src", "_phase:test": "jest --passWithNoTests --silent", @@ -65,5 +65,8 @@ "dotenv": "^16.4.5", "express": "^4.21.2", "maxmind": "^4.3.6" + }, + "bashScripts": { + "run-local": "cross-env APP_ID=$(cat ../../../../uberflow_private/appid) PRIVATE_KEY=\"$(cat ../../../../uberflow_private/private-key.pem)\" CLIENT_ID=$(cat ../../../../uberflow_private/client-id) CLIENT_SECRET=$(cat ../../../../uberflow_private/client-secret) SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000/ COLLABORATOR_URL=http://localhost:3078 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ts-node src/index.ts" } } diff --git a/services/backup/backup-api-pod/package.json b/services/backup/backup-api-pod/package.json index 6cc3780aaa..328617d411 100644 --- a/services/backup/backup-api-pod/package.json +++ b/services/backup/backup-api-pod/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --keep-names=true --sourcemap=external", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/backup-api", - "docker:tbuild": "docker build -t hardcoreeng/backup-api . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/backup-api", - "docker:abuild": "docker build -t hardcoreeng/backup-api . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/backup-api", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/backup-api staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/backup-api", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/backup-api", + "docker:tbuild": "docker build -t hardcoreeng/backup-api . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/backup-api", + "docker:abuild": "docker build -t hardcoreeng/backup-api . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/backup-api", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/backup-api staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/backup-api", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/billing/pod-billing/package.json b/services/billing/pod-billing/package.json index 0d096d9a4c..52528e0a22 100644 --- a/services/billing/pod-billing/package.json +++ b/services/billing/pod-billing/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --keep-names=true --sourcemap=external", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/billing", - "docker:tbuild": "docker build -t hardcoreeng/billing . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/billing", - "docker:abuild": "docker build -t hardcoreeng/billing . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/billing", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/billing staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/billing", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/billing", + "docker:tbuild": "docker build -t hardcoreeng/billing . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/billing", + "docker:abuild": "docker build -t hardcoreeng/billing . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/billing", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/billing staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/billing", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/calendar/pod-calendar-mailer/package.json b/services/calendar/pod-calendar-mailer/package.json index 1838beb8e9..7b90b36b18 100644 --- a/services/calendar/pod-calendar-mailer/package.json +++ b/services/calendar/pod-calendar-mailer/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --external=ws", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/calendar-mailer", - "docker:tbuild": "docker build -t hardcoreeng/calendar-mailer . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/calendar-mailer", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/calendar-mailer staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/calendar-mailer", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/calendar-mailer", + "docker:tbuild": "docker build -t hardcoreeng/calendar-mailer . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/calendar-mailer", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/calendar-mailer staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/calendar-mailer", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/calendar/pod-calendar/package.json b/services/calendar/pod-calendar/package.json index 8ed1bb4730..c2af430637 100644 --- a/services/calendar/pod-calendar/package.json +++ b/services/calendar/pod-calendar/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/calendar", - "docker:tbuild": "docker build -t hardcoreeng/calendar . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/calendar", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/calendar staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/calendar", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/calendar", + "docker:tbuild": "docker build -t hardcoreeng/calendar . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/calendar", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/calendar staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/calendar", "run-local": "ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/datalake/pod-datalake/package.json b/services/datalake/pod-datalake/package.json index 44fc1d259f..5b45347777 100644 --- a/services/datalake/pod-datalake/package.json +++ b/services/datalake/pod-datalake/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --keep-names=true --sourcemap=external", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/datalake", - "docker:tbuild": "docker build -t hardcoreeng/datalake . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/datalake", - "docker:abuild": "docker build -t hardcoreeng/datalake . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/datalake", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/datalake staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/datalake", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/datalake", + "docker:tbuild": "docker build -t hardcoreeng/datalake . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/datalake", + "docker:abuild": "docker build -t hardcoreeng/datalake . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/datalake", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/datalake staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/datalake", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/export/pod-export/package.json b/services/export/pod-export/package.json index f3972f4e9e..c68ef6f762 100644 --- a/services/export/pod-export/package.json +++ b/services/export/pod-export/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --keep-names=true", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/export", - "docker:tbuild": "docker build -t hardcoreeng/export . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/export", - "docker:abuild": "docker build -t hardcoreeng/export . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/export", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/export staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/export", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/export", + "docker:tbuild": "docker build -t hardcoreeng/export . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/export", + "docker:abuild": "docker build -t hardcoreeng/export . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/export", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/export staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/export", "format": "format src", "run-local": "cross-env ts-node src/index.ts", "_phase:build": "compile transpile src", diff --git a/services/github/pod-github/package.json b/services/github/pod-github/package.json index 5537f7f5c5..3ce3f71c02 100644 --- a/services/github/pod-github/package.json +++ b/services/github/pod-github/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --sourcemap=external", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/github", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/github staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/github", - "docker:tbuild": "rush bundle --to @hcengineering/pod-github && docker build -t hardcoreeng/github . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/github", - "run-local": "./run.sh", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/github", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/github staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/github", + "docker:tbuild": "rush bundle --to @hcengineering/pod-github && docker build -t hardcoreeng/github . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/github", + "run-local": "node ../../../common/scripts/bash.js ./run.sh", "format": "format src", "_phase:build": "compile transpile src", "_phase:test": "jest --passWithNoTests --silent", diff --git a/services/gmail/pod-gmail/package.json b/services/gmail/pod-gmail/package.json index bae208fe72..44e54b46ee 100644 --- a/services/gmail/pod-gmail/package.json +++ b/services/gmail/pod-gmail/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/gmail", - "docker:tbuild": "docker build -t hardcoreeng/gmail . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/gmail", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/gmail staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/gmail", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/gmail", + "docker:tbuild": "docker build -t hardcoreeng/gmail . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/gmail", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/gmail staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/gmail", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/love/package.json b/services/love/package.json index 944cb2a8b4..256c037636 100644 --- a/services/love/package.json +++ b/services/love/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/love .", - "docker:tbuild": "docker build -t hardcoreeng/love . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/love", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/love staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/love", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/love .", + "docker:tbuild": "docker build -t hardcoreeng/love . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/love", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/love staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/love", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/mail/pod-mail-worker/package.json b/services/mail/pod-mail-worker/package.json index 8d824932f8..a59bbcf8b9 100644 --- a/services/mail/pod-mail-worker/package.json +++ b/services/mail/pod-mail-worker/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --external=ws", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/mail-worker", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/mail-worker staging", - "docker:abuild": "docker build -t hardcoreeng/mail-worker . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/mail-worker", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/mail-worker", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/mail-worker", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/mail-worker staging", + "docker:abuild": "docker build -t hardcoreeng/mail-worker . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/mail-worker", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/mail-worker", "run-bundle": "rushx bundle --to @hcengineering/pod-mail-worker && cross-env NODE_ENV=production node --inspect bundle/bundle.js", "run-local": "ts-node src/index.ts", "format": "format src", diff --git a/services/mail/pod-mail/package.json b/services/mail/pod-mail/package.json index d16bf28e82..00587a21d2 100644 --- a/services/mail/pod-mail/package.json +++ b/services/mail/pod-mail/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/mail", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/mail staging", - "docker:abuild": "docker build -t hardcoreeng/mail . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/mail", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/mail", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/mail", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/mail staging", + "docker:abuild": "docker build -t hardcoreeng/mail . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/mail", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/mail", "run-local": "ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/notification/pod-events-processor/package.json b/services/notification/pod-events-processor/package.json index 61dcd08b03..fb8205300d 100644 --- a/services/notification/pod-events-processor/package.json +++ b/services/notification/pod-events-processor/package.json @@ -18,9 +18,9 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --external=ws", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/events-processor", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/events-processor staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/events-processor", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/events-processor", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/events-processor staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/events-processor", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", @@ -68,4 +68,3 @@ "dotenv": "^16.4.5" } } - diff --git a/services/notification/pod-notification/package.json b/services/notification/pod-notification/package.json index f43f20f37e..9670f603e1 100644 --- a/services/notification/pod-notification/package.json +++ b/services/notification/pod-notification/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/notification", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/notification staging", - "docker:abuild": "docker build -t hardcoreeng/notification . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/notification", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/notification", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/notification", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/notification staging", + "docker:abuild": "docker build -t hardcoreeng/notification . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/notification", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/notification", "run-local": "cross-env SOURCE=no-reply@bold.ru ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/payment/pod-payment/package.json b/services/payment/pod-payment/package.json index 9bc33bf1c0..f663278614 100644 --- a/services/payment/pod-payment/package.json +++ b/services/payment/pod-payment/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --keep-names=true --sourcemap=external", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/payment", - "docker:tbuild": "docker build -t hardcoreeng/payment . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/payment", - "docker:abuild": "docker build -t hardcoreeng/payment . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/payment", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/payment staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/payment", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/payment", + "docker:tbuild": "docker build -t hardcoreeng/payment . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/payment", + "docker:abuild": "docker build -t hardcoreeng/payment . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/payment", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/payment staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/payment", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/print/pod-print/package.json b/services/print/pod-print/package.json index f571533630..45cf83fa76 100644 --- a/services/print/pod-print/package.json +++ b/services/print/pod-print/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js --keep-names=true", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/print", - "docker:tbuild": "docker build -t hardcoreeng/print . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/print", - "docker:abuild": "docker build -t hardcoreeng/print . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/print", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/print staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/print", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/print", + "docker:tbuild": "docker build -t hardcoreeng/print . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/print", + "docker:abuild": "docker build -t hardcoreeng/print . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/print", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/print staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/print", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/process/package.json b/services/process/package.json index a2fa596f01..3532747cd7 100644 --- a/services/process/package.json +++ b/services/process/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/process .", - "docker:tbuild": "docker build -t hardcoreeng/process . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/process", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/process staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/process", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/process .", + "docker:tbuild": "docker build -t hardcoreeng/process . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/process", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/process staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/process", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/rating/package.json b/services/rating/package.json index 3b14e2efbc..79af986a9b 100644 --- a/services/rating/package.json +++ b/services/rating/package.json @@ -16,11 +16,11 @@ "_phase:docker-staging": "rushx docker:staging", "get-model": "node ../../common/scripts/esbuild.js --entry=src/get-model.ts --keep-names=true --bundle=true --define=MODEL_VERSION --define=VERSION --define=GIT_REVISION && node ./bundle/bundle.js > ./bundle/model.json", "bundle": "rushx get-model && node ../../common/scripts/esbuild.js --entry=./src/__start__.ts --keep-names=true --bundle=true --external=*.node --external=snappy --sourcemap=external", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/rating", - "docker:tbuild": "docker build -t hardcoreeng/rating . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/rating", - "docker:abuild": "docker build -t hardcoreeng/rating . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/rating", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/rating staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/rating", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/rating", + "docker:tbuild": "docker build -t hardcoreeng/rating . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/rating", + "docker:abuild": "docker build -t hardcoreeng/rating . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/rating", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/rating staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/rating", "format": "format src", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", diff --git a/services/rekoni/package.json b/services/rekoni/package.json index 1edd8a1c09..6b288b1952 100644 --- a/services/rekoni/package.json +++ b/services/rekoni/package.json @@ -16,11 +16,11 @@ "_phase:bundle": "rushx bundle", "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/rekoni-service", - "docker:tbuild": "docker build -t hardcoreeng/rekoni-service . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/rekoni-service", - "docker:abuild": "docker build -t hardcoreeng/rekoni-service . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/rekoni-service", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/rekoni-service staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/rekoni-service", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/rekoni-service", + "docker:tbuild": "docker build -t hardcoreeng/rekoni-service . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/rekoni-service", + "docker:abuild": "docker build -t hardcoreeng/rekoni-service . --platform=linux/arm64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/rekoni-service", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/rekoni-service staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/rekoni-service", "bundle": "node esbuild.js", "start": "ts-node-dev src/index.ts", "run-local": "cross-env ts-node src/index.ts", diff --git a/services/sign/pod-sign/package.json b/services/sign/pod-sign/package.json index a10e5280d7..89890fbcc9 100644 --- a/services/sign/pod-sign/package.json +++ b/services/sign/pod-sign/package.json @@ -18,11 +18,11 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/sign", - "docker:tbuild": "docker build -t hardcoreeng/sign . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/sign", - "docker:abuild": "docker build -t hardcoreeng/sign . --platform=linux/arm64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/sign", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/sign staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/sign", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/sign", + "docker:tbuild": "docker build -t hardcoreeng/sign . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/sign", + "docker:abuild": "docker build -t hardcoreeng/sign . --platform=linux/arm64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/sign", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/sign staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/sign", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/telegram-bot/pod-telegram-bot/package.json b/services/telegram-bot/pod-telegram-bot/package.json index 5758b7034f..9880728979 100644 --- a/services/telegram-bot/pod-telegram-bot/package.json +++ b/services/telegram-bot/pod-telegram-bot/package.json @@ -18,9 +18,9 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/telegram-bot", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/telegram-bot staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/telegram-bot", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/telegram-bot", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/telegram-bot staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/telegram-bot", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/telegram/pod-telegram/package.json b/services/telegram/pod-telegram/package.json index 143dd1d506..d6a4327a2c 100644 --- a/services/telegram/pod-telegram/package.json +++ b/services/telegram/pod-telegram/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../../common/scripts/esbuild.js", - "docker:build": "../../../common/scripts/docker_build.sh hardcoreeng/telegram", - "docker:tbuild": "docker build -t hardcoreeng/telegram . --platform=linux/amd64 && ../../../common/scripts/docker_tag_push.sh hardcoreeng/telegram", - "docker:staging": "../../../common/scripts/docker_tag.sh hardcoreeng/telegram staging", - "docker:push": "../../../common/scripts/docker_tag.sh hardcoreeng/telegram", + "docker:build": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_build.sh hardcoreeng/telegram", + "docker:tbuild": "docker build -t hardcoreeng/telegram . --platform=linux/amd64 && node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag_push.sh hardcoreeng/telegram", + "docker:staging": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/telegram staging", + "docker:push": "node ../../../common/scripts/bash.js ../../../common/scripts/docker_tag.sh hardcoreeng/telegram", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/translate/package.json b/services/translate/package.json index c3eeed7660..25b18f70a5 100644 --- a/services/translate/package.json +++ b/services/translate/package.json @@ -18,10 +18,10 @@ "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", "bundle": "node ../../common/scripts/esbuild.js", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/translate .", - "docker:tbuild": "docker build -t hardcoreeng/translate . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/translate", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/translate staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/translate", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/translate .", + "docker:tbuild": "docker build -t hardcoreeng/translate . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/translate", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/translate staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/translate", "run-local": "cross-env ts-node src/index.ts", "format": "format src", "_phase:build": "compile transpile src", diff --git a/services/worker/package.json b/services/worker/package.json index da56d389d5..4bd922bdef 100644 --- a/services/worker/package.json +++ b/services/worker/package.json @@ -18,11 +18,11 @@ "_phase:bundle": "rushx bundle", "_phase:docker-build": "rushx docker:build", "_phase:docker-staging": "rushx docker:staging", - "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/worker .", - "docker:tbuild": "docker build -t hardcoreeng/worker . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/worker", - "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/worker staging", - "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/worker", - "run-local": "cross-env QUEUE_CONFIG='localhost:19092' REGION='cockroach' ts-node src/index.ts", + "docker:build": "node ../../common/scripts/bash.js ../../common/scripts/docker_build.sh hardcoreeng/worker .", + "docker:tbuild": "docker build -t hardcoreeng/worker . --platform=linux/amd64 && node ../../common/scripts/bash.js ../../common/scripts/docker_tag_push.sh hardcoreeng/worker", + "docker:staging": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/worker staging", + "docker:push": "node ../../common/scripts/bash.js ../../common/scripts/docker_tag.sh hardcoreeng/worker", + "run-local": "node ../../common/scripts/bash.js --script run-local", "format": "format src", "_phase:build": "compile transpile src", "_phase:test": "jest --passWithNoTests --silent", @@ -60,5 +60,8 @@ "@hcengineering/server-core": "workspace:^0.7.19", "postgres": "^3.4.7", "dotenv": "^16.4.5" + }, + "bashScripts": { + "run-local": "cross-env QUEUE_CONFIG='localhost:19092' REGION='cockroach' ts-node src/index.ts" } }