From b31b988d543c0f3da98629271e68ada76ed5f836 Mon Sep 17 00:00:00 2001 From: rohow Date: Wed, 24 Dec 2025 12:06:29 +0800 Subject: [PATCH] feat(docker): add git and vim to Dockerfile; update helm chart version to 1.3.2 and image tag to 2.22.0 --- apps/apps/halo/helmchart-shop.yaml | 54 ------------------------------ apps/apps/halo/helmchart.yaml | 5 ++- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 apps/apps/halo/helmchart-shop.yaml diff --git a/apps/apps/halo/helmchart-shop.yaml b/apps/apps/halo/helmchart-shop.yaml deleted file mode 100644 index 1f87b41..0000000 --- a/apps/apps/halo/helmchart-shop.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: helm.cattle.io/v1 -kind: HelmChart -metadata: - name: halo-shop - namespace: apps -spec: - repo: https://halo-sigs.github.io/charts/ - chart: halo - targetNamespace: apps - # 1.2.3版本报错,暂时回退到1.2.2 - version: 1.2.2 - valuesContent: |- - affinity: - podAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - labelSelector: - matchLabels: - cnpg.io/cluster: cnpg17-cluster-hk - role: primary - topologyKey: kubernetes.io/hostname - namespaceSelector: {} - image: - repository: halohub/halo-pro - tag: 2.22.0-alpha.1 - service: - type: ClusterIP - ingress: - enabled: true - ingressClassName: nginx - nginx.ingress.kubernetes.io/configuration-snippet: | - proxy_set_header Accept-Encoding ""; - hostname: shop.dev.cm - path: / - pathType: Prefix - metrics: - enabled: true - mysql: - enabled: false - postgresql: - enabled: false - externalDatabase: - platform: postgresql - host: cnpg17-cluster-hk-rw.infra-data - port: 5432 - user: app - password: FybaFtf6NV5jnxhj5bOPpHbO6KypZeHiyiskgAWkM5nioW2j82HtCf6GnW9xVKjE - database: halo_shop - haloUsername: rohow - haloExternalUrl: https://shop.dev.cm - - - diff --git a/apps/apps/halo/helmchart.yaml b/apps/apps/halo/helmchart.yaml index 6f8cbdb..507f049 100644 --- a/apps/apps/halo/helmchart.yaml +++ b/apps/apps/halo/helmchart.yaml @@ -7,8 +7,7 @@ spec: repo: https://halo-sigs.github.io/charts/ chart: halo targetNamespace: apps - # 1.2.3版本报错,暂时回退到1.2.2 - version: 1.2.2 + version: 1.3.2 valuesContent: |- affinity: podAffinity: @@ -23,7 +22,7 @@ spec: namespaceSelector: {} image: repository: halohub/halo-pro - tag: 2.21.10 + tag: 2.22.0 service: type: ClusterIP ingress: