Skip to content

处理将 conf/run 目录挂载到外部时，restart时会失败的情况 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ideal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

处理将 conf/run 目录挂载到外部时，restart时会失败的情况 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7964a5d
fix: 处理将conf挂载到外部时，restart时的情况
ideal Jul 27, 2023
bcb8ada
update nodejs version to 12.x and fix honeycomb-server start cmd
ideal Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions honeycomb-console/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
13 changes: 12 additions & 1 deletion honeycomb-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion honeycomb-server/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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