From f3843eea8c318b33a0647fb10ac6ee1cca819abb Mon Sep 17 00:00:00 2001 From: "grace.he" Date: Thu, 28 Aug 2025 09:43:45 +0800 Subject: [PATCH 1/3] upgrade node to 22.17.1 --- images/Dockerfile.gsuite-cli | 4 ++-- images/Dockerfile.node | 4 ++-- images/Dockerfile.node-sdet-cli | 4 ++-- images/Dockerfile.node-yarn4 | 4 ++-- images/Dockerfile.node.awscli | 4 ++-- images/Dockerfile.sentry-cli | 4 ++-- images/Dockerfile.sonarscan | 4 ++-- images/Dockerfile.webstore-cli | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/images/Dockerfile.gsuite-cli b/images/Dockerfile.gsuite-cli index a28d150..9ea25a5 100644 --- a/images/Dockerfile.gsuite-cli +++ b/images/Dockerfile.gsuite-cli @@ -1,6 +1,6 @@ -FROM node:20.12.0 +FROM node:22.17.1 -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 22.17.1 RUN node --version RUN npm install @google/clasp -g diff --git a/images/Dockerfile.node b/images/Dockerfile.node index 15c5d31..9375610 100644 --- a/images/Dockerfile.node +++ b/images/Dockerfile.node @@ -1,5 +1,5 @@ -FROM node:20.12.0 -ENV NODE_VERSION 20.12.0 +FROM node:22.17.1 +ENV NODE_VERSION 22.17.1 RUN node --version RUN apt-get update && apt-get install zip #RUN apk update && apk add zip git bash diff --git a/images/Dockerfile.node-sdet-cli b/images/Dockerfile.node-sdet-cli index 83390e4..baedf3f 100644 --- a/images/Dockerfile.node-sdet-cli +++ b/images/Dockerfile.node-sdet-cli @@ -1,6 +1,6 @@ -FROM node:20.12.0 AS nodejs +FROM node:22.17.1 AS nodejs -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 22.17.1 RUN node --version \ && npm version && git --version diff --git a/images/Dockerfile.node-yarn4 b/images/Dockerfile.node-yarn4 index 7d285e7..ea953c5 100644 --- a/images/Dockerfile.node-yarn4 +++ b/images/Dockerfile.node-yarn4 @@ -1,5 +1,5 @@ -FROM node:20.12.0 -ENV NODE_VERSION 20.12.0 +FROM node:22.17.1 +ENV NODE_VERSION 22.17.1 RUN node --version ENV YARN_VERSION berry diff --git a/images/Dockerfile.node.awscli b/images/Dockerfile.node.awscli index 2eec0ed..509a9b7 100644 --- a/images/Dockerfile.node.awscli +++ b/images/Dockerfile.node.awscli @@ -1,5 +1,5 @@ -FROM node:20.12.0 -ENV NODE_VERSION 20.12.0 +FROM node:22.17.1 +ENV NODE_VERSION 22.17.1 RUN node --version RUN apt-get update \ diff --git a/images/Dockerfile.sentry-cli b/images/Dockerfile.sentry-cli index ec80d77..41bd5a2 100644 --- a/images/Dockerfile.sentry-cli +++ b/images/Dockerfile.sentry-cli @@ -1,4 +1,4 @@ -FROM node:20.12.0 -ENV NODE_VERSION 20.12.0 +FROM node:22.17.1 +ENV NODE_VERSION 22.17.1 RUN node --version RUN curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION="2.23.0" sh \ No newline at end of file diff --git a/images/Dockerfile.sonarscan b/images/Dockerfile.sonarscan index 8933068..d90380c 100644 --- a/images/Dockerfile.sonarscan +++ b/images/Dockerfile.sonarscan @@ -1,6 +1,6 @@ -FROM node:20.12.0 +FROM node:22.17.1 -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 22.17.1 RUN npm install -g sonarqube-scanner@3.0.0 diff --git a/images/Dockerfile.webstore-cli b/images/Dockerfile.webstore-cli index c83eb99..c890675 100644 --- a/images/Dockerfile.webstore-cli +++ b/images/Dockerfile.webstore-cli @@ -1,4 +1,4 @@ -FROM node:20.12.0 -ENV NODE_VERSION 20.12.0 +FROM node:22.17.1 +ENV NODE_VERSION 22.17.1 RUN node --version RUN npm install -g chrome-webstore-upload-cli@2.0.1 From be89b3eb92e0e161645ca0704b262b650df04765 Mon Sep 17 00:00:00 2001 From: "grace.he" Date: Thu, 28 Aug 2025 09:59:51 +0800 Subject: [PATCH 2/3] fix zendesk --- images/Dockerfile.zendesk-cli | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/images/Dockerfile.zendesk-cli b/images/Dockerfile.zendesk-cli index ccf9f88..930a22c 100644 --- a/images/Dockerfile.zendesk-cli +++ b/images/Dockerfile.zendesk-cli @@ -1,7 +1,16 @@ -### STAGE 1: Build ### -FROM ringcentral/ruby-node:20.12.0 -ENV NODE_VERSION 20.12.0 +FROM node:22.17.1 + +ENV NODE_VERSION 22.17.1 + +# 安装Ruby环境 +RUN apt-get update && apt-get install -y \ + ruby \ + ruby-dev \ + build-essential \ + && rm -rf /var/lib/apt/lists/* + +# 安装Ruby gems RUN gem install hitimes -v 2.0.0 RUN gem install zendesk_apps_tools \ No newline at end of file From ef2239013ef458a2b1e33f0aeca679e1108d8eed Mon Sep 17 00:00:00 2001 From: "grace.he" Date: Thu, 28 Aug 2025 10:06:47 +0800 Subject: [PATCH 3/3] fix version --- images/Dockerfile.zendesk-cli | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/Dockerfile.zendesk-cli b/images/Dockerfile.zendesk-cli index 930a22c..8828c32 100644 --- a/images/Dockerfile.zendesk-cli +++ b/images/Dockerfile.zendesk-cli @@ -3,11 +3,17 @@ FROM node:22.17.1 ENV NODE_VERSION 22.17.1 -# 安装Ruby环境 +# 安装Ruby环境和必要的依赖 RUN apt-get update && apt-get install -y \ ruby \ ruby-dev \ build-essential \ + git \ + curl \ + libssl-dev \ + libreadline-dev \ + zlib1g-dev \ + libsqlite3-dev \ && rm -rf /var/lib/apt/lists/* # 安装Ruby gems