diff --git a/Dockerfile b/Dockerfile index ef34bb6..1cc493a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,9 @@ COPY . . RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories RUN apk add gcc g++ 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 diff --git a/get_arch.sh b/get_arch.sh new file mode 100644 index 0000000..d41d052 --- /dev/null +++ b/get_arch.sh @@ -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 diff --git a/server/api/routes.go b/server/api/routes.go index 6645c9b..f6ecfdd 100644 --- a/server/api/routes.go +++ b/server/api/routes.go @@ -327,6 +327,9 @@ func InitDBData() (err error) { if err := propertyService.DeleteDeprecatedProperty(); err != nil { return err } + if err := accessGatewayService.ReConnectAll(); err != nil { + return err + } if err := propertyService.InitProperties(); err != nil { return err } @@ -354,9 +357,7 @@ func InitDBData() (err error) { if err := storageService.InitStorages(); err != nil { return err } - if err := accessGatewayService.ReConnectAll(); err != nil { - return err - } + return nil }