Compare commits
2 Commits
dbbe1acbc2
...
9c125f5562
| Author | SHA1 | Date |
|---|---|---|
|
|
9c125f5562 | |
|
|
76f7b9e15c |
37
Dockerfile
37
Dockerfile
|
|
@ -1,38 +1,25 @@
|
||||||
FROM registry.cn-chengdu.aliyuncs.com/go_ls/go-zero:v1 AS builder
|
|
||||||
|
|
||||||
LABEL stage=gobuilder
|
|
||||||
ENV CGO_ENABLED 0
|
|
||||||
ENV GOPROXY https://goproxy.cn,direct
|
|
||||||
|
|
||||||
WORKDIR /src
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
RUN go mod tidy
|
|
||||||
RUN go build -ldflags="-s -w" -o /src/cmd/api/yl cmd/api/yl.go
|
|
||||||
|
|
||||||
|
|
||||||
FROM registry.cn-chengdu.aliyuncs.com/go_ls/alpha:v1 AS runtime
|
# 创建最终镜像,用于运行编译后的Go程序
|
||||||
|
FROM alpine
|
||||||
|
|
||||||
RUN echo 'http://mirrors.ustc.edu.cn/alpine/v3.5/main' > /etc/apk/repositories \
|
RUN echo 'http://mirrors.ustc.edu.cn/alpine/v3.5/main' > /etc/apk/repositories \
|
||||||
&& echo 'http://mirrors.ustc.edu.cn/alpine/v3.5/community' >>/etc/apk/repositories \
|
&& echo 'http://mirrors.ustc.edu.cn/alpine/v3.5/community' >>/etc/apk/repositories \
|
||||||
&& apk update && apk add tzdata \
|
&& apk update && apk add tzdata \
|
||||||
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
|
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
|
||||||
&& echo "Asia/Shanghai" > /etc/timezone
|
&& echo "Asia/Shanghai" > /etc/timezone \
|
||||||
|
|
||||||
|
|
||||||
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
|
# 设置工作目录
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
ENV TZ Asia/Shanghai
|
# 将编译好的二进制文件从构建阶段复制到运行阶段
|
||||||
COPY --from=builder /src /src
|
COPY cmd/api/yl /app/cmd/api/yl
|
||||||
|
COPY cmd/api/config /app/cmd/api/config
|
||||||
|
|
||||||
|
|
||||||
#RUN mkdir "/var/log/supervisor"
|
|
||||||
#
|
|
||||||
#ADD ./sh/startup.sh /opt/startup.sh
|
|
||||||
#RUN sed -i 's/\r//g' /opt/startup.sh
|
|
||||||
#ADD ./sh/supervisord.conf /etc/supervisord.conf
|
|
||||||
|
|
||||||
WORKDIR /src
|
|
||||||
EXPOSE 10102
|
EXPOSE 10102
|
||||||
#CMD ["sh","/opt/startup.sh"]
|
|
||||||
ENTRYPOINT ["/src/cmd/api/yl"]
|
ENV TZ=Asia/Shanghai
|
||||||
|
# 设置容器启动时运行的命令
|
||||||
|
ENTRYPOINT ["/app/cmd/api/yl"]
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ Cache:
|
||||||
- Host: 47.97.27.195:6379
|
- Host: 47.97.27.195:6379
|
||||||
Pass: lansexiongdi@666
|
Pass: lansexiongdi@666
|
||||||
Nacos:
|
Nacos:
|
||||||
|
Timeout: 5000
|
||||||
Endpoints:
|
Endpoints:
|
||||||
- 120.55.12.245:10001
|
- 120.55.12.245:10001
|
||||||
Sys:
|
Sys:
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ type Rpc struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type Nacos struct {
|
type Nacos struct {
|
||||||
|
Timeout int64
|
||||||
Endpoints []string
|
Endpoints []string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,13 @@ type ServiceContext struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewServiceContext(c config.Config) *ServiceContext {
|
func NewServiceContext(c config.Config) *ServiceContext {
|
||||||
|
var timeOut int64 = 2000
|
||||||
|
if c.Nacos.Timeout > 2000 {
|
||||||
|
timeOut = c.Nacos.Timeout
|
||||||
|
}
|
||||||
client := transferClient.NewTransfer(zrpc.MustNewClient(zrpc.RpcClientConf{
|
client := transferClient.NewTransfer(zrpc.MustNewClient(zrpc.RpcClientConf{
|
||||||
Endpoints: c.Nacos.Endpoints,
|
Endpoints: c.Nacos.Endpoints,
|
||||||
|
Timeout: timeOut,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
sqlConn := sqlx.NewMysql(c.DB.Master.DataSource)
|
sqlConn := sqlx.NewMysql(c.DB.Master.DataSource)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue