Merge pull request #298 from APIParkLab/feature/1.7-liujian

update docker build script

Author: Dot-Liu

.gitignore

@@ -7,4 +7,5 @@
 /.vscode/
 .air.toml
 /tmp/
-/work
+/work
+/cmd/

module/service/iml.go

@@ -746,7 +746,9 @@ func (i *imlServiceModule) Delete(ctx context.Context, id string) error {
 			Id: id,
 		})
 		if err != nil {
-			return err
+			if err.Error() != "nil" {
+				return err
+			}
 		}
 		err = client.Subscribe().Offline(ctx, &gateway.SubscribeRelease{
 			Service:     id,

scripts/Dockerfile

@@ -1,10 +1,14 @@
 # 名称：apipark通用镜像
-# 创建时间：2022-10-25
-FROM centos:7.9.2009
-MAINTAINER liujian
+FROM alpine:latest
+
+RUN sed -i 's|https://dl-cdn.alpinelinux.org/alpine|https://mirrors.aliyun.com/alpine|g' /etc/apk/repositories  \
+    && apk update \
+    && apk add --no-cache curl tzdata bind-tools
 
 ENV TZ=Asia/Shanghai
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone
 
 ARG APP
 

scripts/docker_build.sh

@@ -10,6 +10,11 @@ BuildMode=$3
 if [[ "${BuildMode}" == "" ]];then
   BuildMode="all"
 fi
+
+if [[ "${ARCH}" == "" ]];then
+  ARCH="amd64"
+fi
+
 # 编译可执行文件
 ./scripts/build.sh "cmd" "" "${BuildMode}" ${ARCH}
 
@@ -22,12 +27,11 @@ mkdir -p scripts/cmd/ && cp cmd/${APP} scripts/cmd/ && cp cmd/apipark_ai_event_l
 VERSION=$(gen_version)
 
 
-if [[ "${ARCH}" == "" ]];then
-  ARCH="amd64"
-fi
 
-OPTIONS=""
-if [[ "${ARCH}" == "arm" ]];then
+SYS_ARCH=$(arch)
+if [[ (${SYS_ARCH} == "aarch64" || ${SYS_ARCH} == "arm64") && $ARCH == "amd64" ]];then
+  OPTIONS="--platform=linux/amd64"
+elif [[ ${SYS_ARCH}  == "amd64" && $ARCH == "arm64" ]];then
   OPTIONS="--platform=linux/arm64"
 fi
 

scripts/resource/docker_run.sh

@@ -1,11 +1,10 @@
 #!/bin/sh
 
 set -e
-
+source ./init_config.sh
 
 OLD_IFS="$IFS"
 IFS=","
-arr=(${REDIS_ADDR})
 IFS="$OLD_IFS"
 
 
@@ -21,10 +20,11 @@ echo -e "redis:" >> config.yml
 echo -e "  user_name: ${REDIS_USER_NAME}" >> config.yml
 echo -e "  password: ${REDIS_PWD}" >> config.yml
 echo -e "  addr: " >> config.yml
-for s in ${arr[@]}
+for s in $REDIS_ADDR
 do
 echo -e "    - $s" >> config.yml
 done
+
 echo -e "nsq:" >> config.yml
 echo -e "  addr: ${NSQ_ADDR}" >> config.yml
 echo -e "  topic_prefix: ${NSQ_TOPIC_PREFIX}" >> config.yml
@@ -38,5 +38,31 @@ echo -e "  log_period: ${ERROR_PERIOD}" >> config.yml
 
 cat config.yml
 nohup ./apipark >> run.log 2>&1 &
+wait_for_apipark
+
 nohup ./apipark_ai_event_listen >> run.log 2>&1 &
+
+if [[ ${Init} == "true" ]];then
+  login_apipark
+  r=$(is_init)
+  if [[ $r == "true" ]];then
+    echo "Already initialized, skipping initialization."
+    exit 0
+  fi
+  wait_for_influxdb
+
+  wait_for_apinto
+  set_cluster
+
+  wait_for_influxdb
+  set_influxdb
+
+  set_loki
+  set_nsq
+  set_openapi_config
+  # 重启apipark
+  kill -9 $(pgrep apipark)
+  nohup ./apipark >> run.log 2>&1 &
+fi
+
 tail -F run.log