diff --git a/.github/workflows/maven-build.yml b/.github/workflows/backend-build-test.yml similarity index 97% rename from .github/workflows/maven-build.yml rename to .github/workflows/backend-build-test.yml index 079baa79e51..857c104c7e0 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/backend-build-test.yml @@ -1,7 +1,7 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Java CI with Maven +name: Backend CI on: push: @@ -11,9 +11,7 @@ on: jobs: build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: Set up JDK 11 diff --git a/.github/workflows/doc-pdf-builder.yml b/.github/workflows/doc-pdf-builder.yml index 6fd2e18d164..312c29072b8 100644 --- a/.github/workflows/doc-pdf-builder.yml +++ b/.github/workflows/doc-pdf-builder.yml @@ -1,4 +1,4 @@ -name: 'hertzbeat-doc-pdf-builder' +name: 'HertzBeat Doc Pdf Builder' on: page_build diff --git a/.github/workflows/yarn-build.yml b/.github/workflows/frontend-build-test.yml similarity index 95% rename from .github/workflows/yarn-build.yml rename to .github/workflows/frontend-build-test.yml index bb465249944..90dc7432445 100644 --- a/.github/workflows/yarn-build.yml +++ b/.github/workflows/frontend-build-test.yml @@ -1,7 +1,7 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Node CI with Yarn +name: Frontend CI on: push: diff --git a/.github/workflows/issues-translator.yml b/.github/workflows/issues-translator.yml index 6ca07fd0a82..2caad54c2b5 100644 --- a/.github/workflows/issues-translator.yml +++ b/.github/workflows/issues-translator.yml @@ -1,4 +1,4 @@ -name: 'issues-translator' +name: 'Issues Translator' on: issue_comment: types: [created] @@ -6,7 +6,7 @@ on: types: [opened] jobs: - build: + translate: runs-on: ubuntu-latest steps: - uses: usthe/issues-translate-action@v2.7 diff --git a/script/assembly/collector/assembly.xml b/script/assembly/collector/assembly.xml index 5af13b6ed44..2be32abe89e 100644 --- a/script/assembly/collector/assembly.xml +++ b/script/assembly/collector/assembly.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd http://maven.apache.org/ASSEMBLY/2.0.0 "> - 1.4.2 + 1.4.3 tar diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml index 50805a9d640..d8b7b562e3d 100644 --- a/script/assembly/server/assembly.xml +++ b/script/assembly/server/assembly.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd http://maven.apache.org/ASSEMBLY/2.0.0 "> - 1.4.2 + 1.4.3 tar diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh index 87468803e29..0b7da2df314 100644 --- a/script/docker/collector/build.sh +++ b/script/docker/collector/build.sh @@ -31,11 +31,11 @@ fi # 编译上下文目录 CONTEXT_DIR=`pwd` -#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" +COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" #COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" -COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" +#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" #COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile index bd935ede7ec..a522d7241fa 100644 --- a/script/docker/server/Dockerfile +++ b/script/docker/server/Dockerfile @@ -5,9 +5,12 @@ ARG VERSION MAINTAINER tancloud "tomsun28@outlook.com" -# Install SSH -RUN apt-get update && apt-get install -y openssh-server +# Install SSH And Locales +RUN apt-get update && apt-get install -y openssh-server && apt-get install -y locales RUN mkdir /var/run/sshd +# Build zh_CN en_US locale resource package +RUN localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8 +RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 ADD hertzbeat-${VERSION}.tar /opt/ diff --git a/script/helm/hertzbeat/Chart.yaml b/script/helm/hertzbeat/Chart.yaml index 2213ae66c91..f82bdc42169 100644 --- a/script/helm/hertzbeat/Chart.yaml +++ b/script/helm/hertzbeat/Chart.yaml @@ -13,9 +13,9 @@ icon: https://raw.githubusercontent.com/dromara/hertzbeat/master/home/static/img # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.2 +version: 1.4.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v1.4.2" +appVersion: "v1.4.3" diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html index b856d0b9767..cf475394a08 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html @@ -320,7 +320,7 @@ > {{ 'monitor.collector.system.default' | i18n }} diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html index 153b8ba6b21..45b2a457ef0 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html @@ -329,7 +329,7 @@ > {{ 'monitor.collector.system.default' | i18n }} diff --git a/web-app/src/app/shared/constants.ts b/web-app/src/app/shared/constants.ts index 7e3ab2db987..f078b5fd9de 100644 --- a/web-app/src/app/shared/constants.ts +++ b/web-app/src/app/shared/constants.ts @@ -1,3 +1,3 @@ export const CONSTANTS = { - VERSION: 'v1.4.2' + VERSION: 'v1.4.3' };