Merge pull request #4043 from ks-ci-bot/cherry-pick-4042-to-release-3.1

[release-3.1] Change helm path
Change helm path
2021-07-05 18:52:27 +08:00 · 2021-07-05 10:35:45 +00:00 · 2021-07-02 10:38:25 +08:00 · 2021-07-02 02:21:42 +00:00 · 2021-07-01 20:15:25 +08:00 · 2021-07-01 19:24:12 +08:00
4 changed files with 5 additions and 5 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
-# exclude all files and folders except bin folder
-**
 !bin
+.idea/
+.vscode/
--- a/.github/workflows/build-multiarch.yaml
+++ b/.github/workflows/build-multiarch.yaml
@@ -39,4 +39,4 @@ jobs:
        if: github.event_name == 'push'
        run: |
          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG="${GITHUB_REF#refs/heads/}-multiarch" make container-cross-push
+          REPO=kubespheredev TAG="${GITHUB_REF#refs/*/}-multiarch" make container-cross-push
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,4 +64,4 @@ jobs:
        if: github.event_name == 'push'
        run: |
          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG=${GITHUB_REF#refs/heads/} make container-push
+          REPO=kubespheredev TAG=${GITHUB_REF#refs/*/} make container-push
--- a/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper_linux.go
+++ b/pkg/simple/client/openpitrix/helmwrapper/helm_wrapper_linux.go
@@ -17,5 +17,5 @@ limitations under the License.
 package helmwrapper

 const (
-	helmPath = "/usr/bin/helm"
+	helmPath = "/usr/local/bin/helm"
 )
Author	SHA1	Message	Date
KubeSphere CI Bot	0a6fae62a3	Merge pull request #4043 from ks-ci-bot/cherry-pick-4042-to-release-3.1 [release-3.1] Change helm path	2021-07-05 18:52:27 +08:00
LiHui	798d348f21	Change helm path Signed-off-by: LiHui <andrewli@yunify.com>	2021-07-05 10:35:45 +00:00
KubeSphere CI Bot	3dcb5e3d15	Merge pull request #4037 from ks-ci-bot/cherry-pick-4034-to-release-3.1 [release-3.1] Fix failed to push docker images with a specified tag	2021-07-02 10:38:25 +08:00
hongming	90556d498f	Fix failed to push docker images with a specified tag Signed-off-by: hongming <talonwan@yunify.com>	2021-07-02 02:21:42 +00:00
KubeSphere CI Bot	87160cbcc3	Merge pull request #4033 from yuswift/automated-cherry-pick-of-#4026-upstream-release-3.1 fix .dockerignore file ignores .git dir bug	2021-07-01 20:15:25 +08:00
yuswift	f625702910	fix .dockerignore file ignores .git dir bug Signed-off-by: yuswift <yuswift2018@gmail.com>	2021-07-01 19:24:12 +08:00
KubeSphere CI Bot	194e47a2d8	Merge pull request #4020 from yuswift/release-3.1 fix .dockerignore file ignores all files bug	2021-06-30 19:32:24 +08:00
yuswift	f74cbb4e79	fix .dockerignore file ignores all files bug Signed-off-by: yuswift <yuswift2018@gmail.com>	2021-06-30 19:25:08 +08:00