chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue #4884, osbase/osadmin image support amd64/arm64

Browse Source
This commit is contained in:
jianghang.loujh
2023-10-07 21:54:00 +08:00
parent 11f89163c1
commit ed754b5203
17 changed files with 215 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/image/alidata/bin/main.sh
View File

@@ -12,8 +12,8 @@ for e in $(ls /alidata/init/*) ; do
done
echo "==> INIT DEFAULT"
service sshd start
service crond start
systemctl start sshd
systemctl start crond
#echo "check hostname -i: `hostname -i`"
#hti_num=`hostname -i|awk '{print NF}'`
@@ -24,4 +24,4 @@ service crond start
echo "==> INIT DONE"
echo "==> RUN ${*}"
exec "${@}"
exec "${@}"

4
docker/image/app.sh
View File

@@ -87,7 +87,7 @@ function start_canal() {
su admin -c 'cd /home/admin/canal-server/bin/ && sh restart.sh local 1>>/tmp/start.log 2>&1'
sleep 5
#check start
checkStart "canal" "nc 127.0.0.1 $adminPort -w 1 -z | wc -l" 30
checkStart "canal" "nc 127.0.0.1 $adminPort -w 1 -zv 2> /tmp/nc.out && cat /tmp/nc.out | grep -c Connected" 30
else
metricsPort=`perl -le 'print $ENV{"canal.metrics.pull.port"}'`
if [ -z "$metricsPort" ] ; then
@@ -120,7 +120,7 @@ function start_canal() {
su admin -c 'cd /home/admin/canal-server/bin/ && sh restart.sh 1>>/tmp/start.log 2>&1'
sleep 5
#check start
checkStart "canal" "nc 127.0.0.1 $metricsPort -w 1 -z | wc -l" 30
checkStart "canal" "nc 127.0.0.1 $metricsPort -w 1 -zv 2> /tmp/nc.out && cat /tmp/nc.out | grep -c Connected" 30
fi
}