From 7964a5dd3db5f15a505af6b76c17d55bd026aeb9 Mon Sep 17 00:00:00 2001
From: ideal <idealities@gmail.com>
Date: Thu, 27 Jul 2023 10:39:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=B0=86conf?=
 =?UTF-8?q?=E6=8C=82=E8=BD=BD=E5=88=B0=E5=A4=96=E9=83=A8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?restart=E6=97=B6=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 honeycomb-console/start.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/honeycomb-console/start.sh b/honeycomb-console/start.sh
index 5d02ccd..176d381 100644
--- a/honeycomb-console/start.sh
+++ b/honeycomb-console/start.sh
@@ -8,7 +8,9 @@ if [ ! -d /home/admin/honeycomb ]; then
 fi
 
 # patch server_ctl
-mv /tmp/server_ctl /home/admin/honeycomb/bin/server_ctl
+if [ -f /tmp/server_ctl ]; then
+    mv /tmp/server_ctl /home/admin/honeycomb/bin/server_ctl
+fi
 
 chown admin:admin -R /home/admin/honeycomb
 
@@ -20,7 +22,8 @@ fi
 echo "starting honeycomb server..."
 
 su admin -c "/home/admin/honeycomb/bin/server_ctl start"
-
-cd /home/admin/apps && control publish ./honeycomb-console_$HONEYCOMB_VERSION.tgz
+if ! ls /home/admin/honeycomb/run/appsRoot/honeycomb-console* > /dev/null 2>&1; then
+    cd /home/admin/apps && control publish ./honeycomb-console_$HONEYCOMB_VERSION.tgz
+fi
 
 sleep inf

From bcb8ada00c21ce168c6e9a0db32fa578bb329c00 Mon Sep 17 00:00:00 2001
From: ideal <idealities@gmail.com>
Date: Wed, 6 Dec 2023 22:56:05 +0800
Subject: [PATCH 2/2] update nodejs version to 12.x and fix honeycomb-server
 start cmd

---
 honeycomb-server/Dockerfile | 13 ++++++++++++-
 honeycomb-server/start.sh   |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/honeycomb-server/Dockerfile b/honeycomb-server/Dockerfile
index 26c1960..f7c08b1 100644
--- a/honeycomb-server/Dockerfile
+++ b/honeycomb-server/Dockerfile
@@ -10,7 +10,6 @@ RUN REPO_FILE=Centos-7.repo && \
     if [ `arch` = 'aarch64' -o `arch` = 'arm64' ]; then REPO_FILE=Centos-altarch-7.repo; fi && \
     curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/$REPO_FILE && \
     sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo && \
-    sed -i 's/mirrors.aliyun.com/mirrors.ustc.edu.cn/g' /etc/yum.repos.d/CentOS-Base.repo && \
     yum update -y && \
     yum install -y perl cronie make wget
 
@@ -20,6 +19,18 @@ RUN REPO_FILE=Centos-7.repo && \
 COPY honeycomb-server.rpm /tmp/honeycomb-server.rpm
 RUN rpm -i /tmp/honeycomb-server.rpm
 
+# 升级 node 版本
+RUN wget -nv https://nodejs.org/dist/v12.13.0/node-v12.13.0-linux-x64.tar.xz && \
+    tar xf node-v12.13.0-linux-x64.tar.xz && \
+    mv node-v12.13.0-linux-x64 node && \
+    rm -rf node-v12.13.0-linux-x64.tar.xz && \
+    tar zxf /home/admin/honeycomb/target/honeycomb.tgz && \
+    rm -rf honeycomb/node_modules/node && \
+    mv node honeycomb/node_modules/node && \
+    tar zcf honeycomb.tgz honeycomb && \
+    mv honeycomb.tgz /home/admin/honeycomb/target/honeycomb.tgz && \
+    chown admin:admin /home/admin/honeycomb/target/honeycomb.tgz
+
 # set locale
 COPY lang.sh /etc/profile.d
 
diff --git a/honeycomb-server/start.sh b/honeycomb-server/start.sh
index 3509092..15d904b 100644
--- a/honeycomb-server/start.sh
+++ b/honeycomb-server/start.sh
@@ -3,6 +3,6 @@
 set -e
 
 echo "starting honeycomb server..."
-su admin && cd /home/admin/honeycomb/bin && server_ctl start
+su admin -c "cd /home/admin/honeycomb/bin && ./server_ctl start"
 
 sleep inf