diff --git a/dockerfiles/cd/builders/tidb-dashboard/Dockerfile b/dockerfiles/cd/builders/tidb-dashboard/Dockerfile index b7a22fe5..e53ba670 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/Dockerfile +++ b/dockerfiles/cd/builders/tidb-dashboard/Dockerfile @@ -27,9 +27,9 @@ ENV PATH /usr/local/go/bin/:$PATH LABEL go-version="${GOLANG_VERSION}" # Install nodejs. -RUN curl -fsSL https://rpm.nodesource.com/setup_18.x | bash - -RUN yum -y install nodejs && yum clean all -RUN npm install -g pnpm@9.7.0 +RUN curl -fsSL https://rpm.nodesource.com/setup_22.x | bash - && \ + yum -y install nodejs && yum clean all && \ + npm install -g pnpm@9.12.2 ########### stage: non-root-builder, used for development with non-root user. FROM builder AS non-root-builder diff --git a/dockerfiles/cd/builders/tidb-dashboard/centos7/Dockerfile b/dockerfiles/cd/builders/tidb-dashboard/centos7/Dockerfile index 715c77e6..1c22e1a7 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/centos7/Dockerfile +++ b/dockerfiles/cd/builders/tidb-dashboard/centos7/Dockerfile @@ -30,9 +30,9 @@ ENV PATH /usr/local/go/bin/:$PATH LABEL go-version="${GOLANG_VERSION}" # Install nodejs. -RUN curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - -RUN yum -y install nodejs && yum clean all -RUN npm install -g pnpm@7.30.5 +RUN curl -fsSL https://rpm.nodesource.com/setup_22.x | bash - && \ + yum -y install nodejs && yum clean all && \ + npm install -g pnpm@9.12.2 ########### stage: non-root-builder, used for development with non-root user. FROM builder AS non-root-builder diff --git a/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.non-root.yaml b/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.non-root.yaml index 043fffdb..189a2633 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.non-root.yaml +++ b/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.non-root.yaml @@ -23,7 +23,7 @@ profiles: patches: - op: replace path: /build/tagPolicy/customTemplate/template - value: "{{ .GIT }}-centos7-non-root-go1.25" + value: "{{ .GIT }}-centos7-non-root-go1.25-node22" - op: add path: /build/artifacts/0/docker/buildArgs value: diff --git a/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.yaml b/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.yaml index f478788d..086e452b 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.yaml +++ b/dockerfiles/cd/builders/tidb-dashboard/skaffold.centos7.yaml @@ -23,7 +23,7 @@ profiles: patches: - op: replace path: /build/tagPolicy/customTemplate/template - value: "{{ .GIT }}-centos7-go1.25" + value: "{{ .GIT }}-centos7-go1.25-node22" - op: add path: /build/artifacts/0/docker/buildArgs value: diff --git a/dockerfiles/cd/builders/tidb-dashboard/skaffold.non-root.yaml b/dockerfiles/cd/builders/tidb-dashboard/skaffold.non-root.yaml index 2b8ceb8b..8424b932 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/skaffold.non-root.yaml +++ b/dockerfiles/cd/builders/tidb-dashboard/skaffold.non-root.yaml @@ -24,7 +24,7 @@ profiles: patches: - op: replace path: /build/tagPolicy/customTemplate/template - value: "{{ .GIT }}-non-root-go1.25" + value: "{{ .GIT }}-non-root-go1.25-node22" - op: add path: /build/artifacts/0/docker/buildArgs value: diff --git a/dockerfiles/cd/builders/tidb-dashboard/skaffold.yaml b/dockerfiles/cd/builders/tidb-dashboard/skaffold.yaml index 6e0dba31..419bfbae 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/skaffold.yaml +++ b/dockerfiles/cd/builders/tidb-dashboard/skaffold.yaml @@ -24,7 +24,7 @@ profiles: patches: - op: replace path: /build/tagPolicy/customTemplate/template - value: "{{ .GIT }}-go1.25" + value: "{{ .GIT }}-go1.25-node22" - op: add path: /build/artifacts/0/docker/buildArgs value: