fix: release workflows bug

* feat: refactor

* refactor apps folder

* feat: add vendor folder

* refactor: package scripts

---------

Co-authored-by: eball <liuy102@hotmail.com>

.github/workflows/build-redis-231.yaml

@@ -17,4 +17,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/build-redis.sh linux/amd64 glibc-231
+          bash build/build-redis.sh linux/amd64 glibc-231

.github/workflows/build-redis.yaml

@@ -17,7 +17,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/build-redis.sh linux/amd64
+          bash build/build-redis.sh linux/amd64
 
   push-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -40,4 +40,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          sudo -E sh -c "bash scripts/build-redis.sh linux/arm64 && rm -rf redis*"
+          sudo -E sh -c "bash build/build-redis.sh linux/arm64 && rm -rf redis*"

.github/workflows/build-ubuntu2204.yaml

@@ -17,4 +17,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/build-ubuntu2204.sh
+          bash build/build-ubuntu2204.sh

.github/workflows/build-wsl2326.yaml

@@ -17,4 +17,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/build-wsl-install-msi.sh
+          bash build/build-wsl-install-msi.sh

.github/workflows/check.yaml

@@ -35,10 +35,10 @@ jobs:
       
       - name: Pre package
         run: |
-          bash scripts/package.sh
+          bash build/package.sh
 
       - name: Run chart-testing (lint)
-        run: ct lint --chart-dirs build/installer/wizard/config,build/installer/wizard/config/apps,build/installer/wizard/config/gpu --check-version-increment=false --all
+        run: ct lint --chart-dirs .dist/wizard/config,.dist/wizard/config/apps,.dist/wizard/config/gpu --check-version-increment=false --all
 
       # - name: Create kind cluster
       #   if: steps.list-changed.outputs.changed == 'true'
@@ -65,7 +65,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
 
   push-image-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -85,7 +85,7 @@ jobs:
           AWS_DEFAULT_REGION: 'us-east-1'
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64
 
 
   push-deps:
@@ -105,7 +105,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/deps-manifest.sh && bash scripts/upload-deps.sh
+          bash build/deps-manifest.sh && bash build/upload-deps.sh
 
   push-deps-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -128,7 +128,7 @@ jobs:
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/deps-manifest.sh linux/arm64 && bash scripts/upload-deps.sh linux/arm64
+          bash build/deps-manifest.sh linux/arm64 && bash build/upload-deps.sh linux/arm64
 
 
 
@@ -151,7 +151,7 @@ jobs:
 
       - name: Package installer
         run: |
-          bash scripts/build.sh ${{ steps.vars.outputs.tag_version }}
+          bash build/build.sh ${{ steps.vars.outputs.tag_version }}
 
       - name: Upload package
         env: 

.github/workflows/daily-lint-check.yaml

@@ -29,9 +29,9 @@ jobs:
       
       - name: Pre package
         run: |
-          bash scripts/package.sh
+          bash build/package.sh
 
       - name: Run chart-testing (lint)
         run: |
-          ct lint --chart-dirs build/installer/wizard/config,build/installer/wizard/config/apps,build/installer/wizard/config/gpu --check-version-increment=false --all
+          ct lint --chart-dirs .dist/wizard/config,.dist/wizard/config/apps,.dist/wizard/config/gpu --check-version-increment=false --all
 

.github/workflows/push-deps-to-s3.yml

@@ -33,7 +33,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/deps-manifest.sh && bash scripts/upload-deps.sh
+          bash build/deps-manifest.sh && bash build/upload-deps.sh
 
   push-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -66,4 +66,4 @@ jobs:
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/deps-manifest.sh linux/arm64 && bash scripts/upload-deps.sh linux/arm64
+          bash build/deps-manifest.sh linux/arm64 && bash build/upload-deps.sh linux/arm64

.github/workflows/push-to-s3.yaml

@@ -33,7 +33,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
 
   push-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -65,4 +65,4 @@ jobs:
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64

.github/workflows/release-daily.yaml

@@ -21,7 +21,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
         run: |
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
 
   push-images-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -36,7 +36,7 @@ jobs:
           AWS_DEFAULT_REGION: 'us-east-1'
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64
 
   push-deps:
     runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
-          bash scripts/deps-manifest.sh && bash scripts/upload-deps.sh
+          bash build/deps-manifest.sh && bash build/upload-deps.sh
 
   push-deps-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -67,7 +67,7 @@ jobs:
           AWS_DEFAULT_REGION: "us-east-1"
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/deps-manifest.sh linux/arm64 && bash scripts/upload-deps.sh linux/arm64
+          bash build/deps-manifest.sh linux/arm64 && bash build/upload-deps.sh linux/arm64
 
 
   upload-package:
@@ -86,7 +86,7 @@ jobs:
 
       - name: Package installer
         run: |
-          bash scripts/build.sh ${{ steps.vars.outputs.tag_version }}
+          bash build/build.sh ${{ steps.vars.outputs.tag_version }}
 
       - name: Upload to S3
         env: 
@@ -117,19 +117,19 @@ jobs:
       - name: Update checksum
         uses: eball/write-tag-to-version-file@latest
         with:
-          filename: 'build/installer/install.sh'
+          filename: 'build/base-package/install.sh'
           placeholder: '#__MD5SUM__'
           tag: ${{ steps.vars.outputs.version_md5sum }}
       
       - name: Package installer
         run: |
-          bash scripts/build.sh ${{ steps.vars.outputs.tag_version }}
+          bash build/build.sh ${{ steps.vars.outputs.tag_version }}
 
       - name: 'Archives'
         run: |
-          cp .dist/install-wizard/install.sh build/installer
+          cp .dist/install-wizard/install.sh build/base-package
-          cp build/installer/install.sh build/installer/publicInstaller.sh
+          cp build/base-package/install.sh build/base-package/publicInstaller.sh
-          cp .dist/install-wizard/install.ps1 build/installer
+          cp .dist/install-wizard/install.ps1 build/base-package
 
       - name: Release public files
         uses: softprops/action-gh-release@v1
@@ -138,13 +138,13 @@ jobs:
           tag_name: ${{ steps.vars.outputs.tag_version }}
           files: |
             install-wizard-v${{ steps.vars.outputs.tag_version }}.tar.gz
-            build/installer/publicInstaller.sh
+            build/base-package/publicInstaller.sh
-            build/installer/install.sh
+            build/base-package/install.sh
-            build/installer/install.ps1
+            build/base-package/install.ps1
-            build/installer/joincluster.sh
+            build/base-package/joincluster.sh
-            build/installer/publicAddnode.sh
+            build/base-package/publicAddnode.sh
-            build/installer/version.hint
+            build/base-package/version.hint
-            build/installer/publicRestoreInstaller.sh
+            build/base-package/publicRestoreInstaller.sh
           prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
         run: |
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
 
   push-arm64:
     runs-on: [self-hosted, linux, ARM64]
@@ -40,7 +40,7 @@ jobs:
           AWS_DEFAULT_REGION: 'us-east-1'
         run: |
           export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
-          bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
+          bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64
 
   upload-package:
     needs: [push, push-arm64]
@@ -54,7 +54,7 @@ jobs:
 
       - name: Package installer
         run: |
-          bash scripts/build.sh ${{ github.event.inputs.tags }}
+          bash build/build.sh ${{ github.event.inputs.tags }}
 
       - name: Upload to S3
         env: 
@@ -77,7 +77,7 @@ jobs:
           ref: ${{ github.event.inputs.tags }}
 
       - name: Update env
-        working-directory: ./build/installer
+        working-directory: ./build/base-package
         run: |
           echo 'DEBUG_VERSION="false"' > .env
 
@@ -89,21 +89,21 @@ jobs:
       - name: Update checksum
         uses: eball/write-tag-to-version-file@latest
         with:
-          filename: 'build/installer/install.sh'
+          filename: 'build/base-package/install.sh'
           placeholder: '#__MD5SUM__'
           tag: ${{ steps.vars.outputs.version_md5sum }}
 
       - name: Package installer
         run: |
-          bash scripts/build.sh ${{ github.event.inputs.tags }}
+          bash build/build.sh ${{ github.event.inputs.tags }}
           
       - name: 'Archives'
         run: |
-          cp .dist/install-wizard/install.sh build/installer
+          cp .dist/install-wizard/install.sh build/base-package
-          cp build/installer/install.sh build/installer/publicInstaller.sh
+          cp build/base-package/install.sh build/base-package/publicInstaller.sh
-          cp build/installer/install.sh build/installer/publicInstaller.latest
+          cp build/base-package/install.sh build/base-package/publicInstaller.latest
-          cp .dist/install-wizard/install.ps1 build/installer
+          cp .dist/install-wizard/install.ps1 build/insbase-packagetaller
-          cp build/installer/install.ps1 build/installer/publicInstaller.latest.ps1
+          cp build/base-package/install.ps1 build/base-package/publicInstaller.latest.ps1
 
       - name: Release public files
         uses: softprops/action-gh-release@v1
@@ -112,15 +112,15 @@ jobs:
           tag_name: ${{ github.event.inputs.tags }}
           files: |
             install-wizard-v${{ github.event.inputs.tags }}.tar.gz
-            build/installer/publicInstaller.sh
+            build/base-package/publicInstaller.sh
-            build/installer/publicInstaller.latest
+            build/base-package/publicInstaller.latest
-            build/installer/install.sh
+            build/base-package/install.sh
-            build/installer/publicInstaller.latest.ps1
+            build/base-package/publicInstaller.latest.ps1
-            build/installer/install.ps1
+            build/base-package/install.ps1
-            build/installer/publicAddnode.sh
+            build/base-package/publicAddnode.sh
-            build/installer/joincluster.sh
+            build/instbase-packagealler/joincluster.sh
-            build/installer/version.hint
+            build/base-package/version.hint
-            build/installer/publicRestoreInstaller.sh
+            build/base-package/publicRestoreInstaller.sh
           prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -23,6 +23,7 @@ go.work
 
 .dist
 .manifest
+.dependencies
 install-wizard-*.tar.gz
 olares-cli-*.tar.gz
 !ks-console-*.tgz

apps/.olares/config/cluster/deploy/files_deploy.yaml

@@ -303,7 +303,7 @@ spec:
             runAsUser: 0
             privileged: true
         - name: nginx
-          image: 'eball/nginx-header-more:test-3'
+          image: 'beclab/docker-nginx-headers-more:ubuntu-v0.1.0'
           securityContext:
             runAsNonRoot: false
             runAsUser: 0

apps/.olares/config/user/helm-charts/desktop/templates/desktop_deploy.yaml

@@ -66,7 +66,7 @@ spec:
 
       containers:
       - name: edge-desktop
-        image: beclab/desktop:v0.2.58
+        image: beclab/desktop:v0.2.59
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsNonRoot: false
@@ -78,7 +78,7 @@ spec:
             value: http://bfl.{{ .Release.Namespace }}:8080
 
       - name: desktop-server
-        image: beclab/desktop-server:v0.2.58
+        image: beclab/desktop-server:v0.2.59
         imagePullPolicy: IfNotPresent
         securityContext:
           allowPrivilegeEscalation: false

apps/.olares/config/user/helm-charts/files/templates/files_fe_deploy.yaml

@@ -318,7 +318,7 @@ spec:
 #        - /filebrowser
 #        - --noauth
       - name: files-frontend
-        image: eball/nginx-header-more:test-3
+        image: beclab/docker-nginx-headers-more:ubuntu-v0.1.0
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsNonRoot: false

apps/.olares/config/user/helm-charts/market/templates/market_deploy.yaml

@@ -1,5 +1,4 @@
-{{- $namespace := printf "%s%s" "user-system-" .Values.bfl.username -}}
+{{- $market_secret := (lookup "v1" "Secret" .Release.Namespace "market-secrets") -}}
-{{- $market_secret := (lookup "v1" "Secret" $namespace "market-secrets") -}}
 
 {{- $redis_password := "" -}}
 {{ if $market_secret -}}
@@ -91,7 +90,7 @@ spec:
                 apiVersion: v1
                 fieldPath: status.podIP
         - name: nginx-init
-          image: beclab/market-frontend:v0.3.11
+          image: beclab/market-frontend:v0.3.12
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: app
@@ -105,7 +104,7 @@ spec:
             cp -rf /app/* /cp_app/. && cp -rf /etc/nginx/conf.d/* /confd/.            
       containers:
       - name: appstore
-        image: eball/nginx-header-more:test-3
+        image: beclab/docker-nginx-headers-more:ubuntu-v0.1.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
@@ -116,7 +115,7 @@ spec:
           mountPath: /etc/nginx/conf.d
         
       - name: appstore-backend
-        image: beclab/market-backend:v0.3.11
+        image: beclab/market-backend:v0.3.12
         imagePullPolicy: IfNotPresent
         ports:
           - containerPort: 81

apps/.olares/config/user/helm-charts/monitoring/templates/system-frontend.yaml

@@ -256,7 +256,7 @@ spec:
             - mountPath: /www
               name: www-dir
         - name: settings-init
-          image: beclab/settings:v1.3.62
+          image: beclab/settings:v1.3.63
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -268,7 +268,7 @@ spec:
             - mountPath: /www
               name: www-dir
         - name: studio-init
-          image: beclab/studio:v0.2.11
+          image: beclab/studio:v0.2.16
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -305,7 +305,7 @@ spec:
             - -c
             - /etc/envoy/envoy.yaml
         - name: system-frontend
-          image: eball/nginx-header-more:test-3
+          image: beclab/docker-nginx-headers-more:ubuntu-v0.1.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 81
@@ -385,7 +385,7 @@ spec:
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
         - name: settings-server
-          image: beclab/settings-server:v0.2.22
+          image: beclab/settings-server:v0.2.23
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 3000

apps/argo/README.md

@@ -1,2 +0,0 @@
-# RSS Recommend
-

apps/desktop/README.md

@@ -1,3 +0,0 @@
-# desktop
-
-https://github.com/beclab/desktop

apps/files/README.md

@@ -1,3 +0,0 @@
-# files
-
-https://github.com/beclab/files

apps/market-server/README.md

@@ -1,3 +0,0 @@
-# market-server
-
-https://github.com/beclab/market-server

apps/market/README.md

@@ -1,3 +0,0 @@
-# Market (app store)
-
-https://github.com/beclab/market

apps/rss/README.md

@@ -1,3 +0,0 @@
-# vault
-
-https://github.com/beclab/analytic

apps/search/README.md

@@ -1,3 +0,0 @@
-# search
-
-https://github.com/beclab/dify-gateway

apps/studio/README.md

@@ -1,4 +0,0 @@
-# devbox
-Terminus App development management tools
-
-https://github.com/beclab/devbox

apps/system-apps/README.md

@@ -1,5 +0,0 @@
-# system-apps
-
-dashboard control-hub
-
-https://github.com/beclab/system-apps

apps/vault/README.md

@@ -1,3 +0,0 @@
-# TermiPass
-
-https://github.com/beclab/TermiPass

apps/wizard/README.md

@@ -1,3 +0,0 @@
-# wizard
-
-https://github.com/beclab/wizard