修复重启时进行资产状态检测空指针的问题
This commit is contained in:
parent
5fc20f1592
commit
a8327f7f1a
@ -11,7 +11,9 @@ COPY . .
|
|||||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
|
||||||
RUN apk add gcc g++
|
RUN apk add gcc g++
|
||||||
RUN go mod tidy
|
RUN go mod tidy
|
||||||
RUN go env;ARCH="$(arch)";case "$ARCH" in 'x86_64') export ARCH='amd64';echo $ARCH;; 'aarch64') export ARCH='arm64';echo $ARCH;; 'i386') export ARCH='i386';echo $ARCH;; esac;CGO_ENABLED=1 GOOS=linux GOARCH=$ARCH go build -a -ldflags '-linkmode external -extldflags "-static"' -o next-terminal main.go
|
RUN sh get_arch.sh
|
||||||
|
RUN echo "Hello, my CPU architecture is $(uname -m)"
|
||||||
|
RUN go env;CGO_ENABLED=1 GOOS=linux GOARCH=$ARCH go build -ldflags '-s -w' -o next-terminal main.go
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
|
15
get_arch.sh
Normal file
15
get_arch.sh
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
ARCH="$(arch)"
|
||||||
|
case "$ARCH" in
|
||||||
|
'x86_64')
|
||||||
|
export ARCH='amd64'
|
||||||
|
echo $ARCH
|
||||||
|
;;
|
||||||
|
'aarch64')
|
||||||
|
export ARCH='arm64'
|
||||||
|
echo $ARCH
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
export ARCH=$ARCH
|
||||||
|
echo $ARCH
|
||||||
|
;;
|
||||||
|
esac
|
@ -327,6 +327,9 @@ func InitDBData() (err error) {
|
|||||||
if err := propertyService.DeleteDeprecatedProperty(); err != nil {
|
if err := propertyService.DeleteDeprecatedProperty(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := accessGatewayService.ReConnectAll(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
if err := propertyService.InitProperties(); err != nil {
|
if err := propertyService.InitProperties(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -354,9 +357,7 @@ func InitDBData() (err error) {
|
|||||||
if err := storageService.InitStorages(); err != nil {
|
if err := storageService.InitStorages(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := accessGatewayService.ReConnectAll(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user