-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 0915-yuluo/discovery
- Loading branch information
Showing
14 changed files
with
12,747 additions
and
12,724 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,38 @@ | ||
| { | ||
| "name": "Hertzbeat DevContainer", | ||
| "image": "mcr.microsoft.com/devcontainers/base:ubuntu", | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/java:1": { | ||
| "version": "17", | ||
| "installMaven": "true", | ||
| "installGradle": "false" | ||
| }, | ||
| "ghcr.io/devcontainers/features/node:1": { | ||
| "version": "20" | ||
| }, | ||
| "ghcr.io/devcontainers/features/git-lfs:1.1.0": {} | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "settings": {}, | ||
| // same extensions as Gitpod, should match /.gitpod.yml | ||
| "extensions": [ | ||
| "vscjava.vscode-java-pack", | ||
| "editorconfig.editorconfig", | ||
| "dbaeumer.vscode-eslint", | ||
| "stylelint.vscode-stylelint", | ||
| "DavidAnson.vscode-markdownlint", | ||
| "ms-azuretools.vscode-docker", | ||
| "cweijan.vscode-database-client2", | ||
| "GitHub.vscode-pull-request-github" | ||
| ] | ||
| } | ||
| }, | ||
| "portsAttributes": { | ||
| "4200": { | ||
| "label": "Hertzbeat Web", | ||
| "onAutoForward": "notify" | ||
| } | ||
| }, | ||
| "postCreateCommand": "java -version" | ||
| } | ||
| { | ||
| "name": "Hertzbeat DevContainer", | ||
| "image": "mcr.microsoft.com/devcontainers/base:ubuntu", | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/java:1": { | ||
| "version": "17", | ||
| "installMaven": "true", | ||
| "installGradle": "false" | ||
| }, | ||
| "ghcr.io/devcontainers/features/node:1": { | ||
| "version": "20" | ||
| }, | ||
| "ghcr.io/devcontainers/features/git-lfs:1.1.0": {} | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "settings": {}, | ||
| // same extensions as Gitpod, should match /.gitpod.yml | ||
| "extensions": [ | ||
| "vscjava.vscode-java-pack", | ||
| "editorconfig.editorconfig", | ||
| "dbaeumer.vscode-eslint", | ||
| "stylelint.vscode-stylelint", | ||
| "DavidAnson.vscode-markdownlint", | ||
| "ms-azuretools.vscode-docker", | ||
| "cweijan.vscode-database-client2", | ||
| "GitHub.vscode-pull-request-github" | ||
| ] | ||
| } | ||
| }, | ||
| "portsAttributes": { | ||
| "4200": { | ||
| "label": "Hertzbeat Web", | ||
| "onAutoForward": "notify" | ||
| } | ||
| }, | ||
| "postCreateCommand": "java -version" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,53 @@ | ||
| tasks: | ||
|
|
||
| - name: Run backend | ||
| before: cd manager | ||
| command: | | ||
| gp sync-await setup-backend | ||
| mvn spring-boot:run | ||
| - name: Run frontend | ||
| before: cd web-app | ||
| command: | | ||
| gp sync-await setup-frontend | ||
| yarn start --public-host "`gp url 4200`" | ||
| openMode: split-right | ||
|
|
||
| - name: Setup backend | ||
| init: | | ||
| sdk install java 17.0.11.fx-zulu < /dev/null | ||
| sdk default java 17.0.11.fx-zulu < /dev/null | ||
| mvn clean install -DskipTests | ||
| command: | | ||
| gp sync-done setup-backend | ||
| exit 0 | ||
| - name: Setup frontend | ||
| init: | | ||
| cd web-app && yarn install | ||
| command: | | ||
| gp sync-done setup-frontend | ||
| exit 0 | ||
| openMode: split-right | ||
|
|
||
| vscode: | ||
| extensions: | ||
| - vscjava.vscode-java-pack | ||
| - editorconfig.editorconfig | ||
| - dbaeumer.vscode-eslint | ||
| - stylelint.vscode-stylelint | ||
| - DavidAnson.vscode-markdownlint | ||
| - ms-azuretools.vscode-docker | ||
| - cweijan.vscode-database-client2 | ||
| - GitHub.vscode-pull-request-github | ||
|
|
||
| ports: | ||
| - port: 4200 | ||
| name: Hertzbeat | ||
| onOpen: open-browser | ||
|
|
||
| - port: 1157 | ||
| onOpen: ignore | ||
|
|
||
| - port: 1158 | ||
| onOpen: ignore | ||
| tasks: | ||
|
|
||
| - name: Run backend | ||
| before: cd manager | ||
| command: | | ||
| gp sync-await setup-backend | ||
| mvn spring-boot:run | ||
| - name: Run frontend | ||
| before: cd web-app | ||
| command: | | ||
| gp sync-await setup-frontend | ||
| yarn start --public-host "`gp url 4200`" | ||
| openMode: split-right | ||
|
|
||
| - name: Setup backend | ||
| init: | | ||
| sdk install java 17.0.11.fx-zulu < /dev/null | ||
| sdk default java 17.0.11.fx-zulu < /dev/null | ||
| mvn clean install -DskipTests | ||
| command: | | ||
| gp sync-done setup-backend | ||
| exit 0 | ||
| - name: Setup frontend | ||
| init: | | ||
| cd web-app && yarn install | ||
| command: | | ||
| gp sync-done setup-frontend | ||
| exit 0 | ||
| openMode: split-right | ||
|
|
||
| vscode: | ||
| extensions: | ||
| - vscjava.vscode-java-pack | ||
| - editorconfig.editorconfig | ||
| - dbaeumer.vscode-eslint | ||
| - stylelint.vscode-stylelint | ||
| - DavidAnson.vscode-markdownlint | ||
| - ms-azuretools.vscode-docker | ||
| - cweijan.vscode-database-client2 | ||
| - GitHub.vscode-pull-request-github | ||
|
|
||
| ports: | ||
| - port: 4200 | ||
| name: Hertzbeat | ||
| onOpen: open-browser | ||
|
|
||
| - port: 1157 | ||
| onOpen: ignore | ||
|
|
||
| - port: 1158 | ||
| onOpen: ignore |
Oops, something went wrong.