Skip to content

Commit 517915c

Browse files
committed
fix build docker bug, copy tars2case to docker
1 parent 5c50b55 commit 517915c

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ else(WIN32)
145145
install(DIRECTORY deploy DESTINATION ./
146146
PATTERN "*.sh"
147147
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
148+
install(FILES ${PROJECT_BINARY_DIR}/bin/tars2case DESTINATION deploy)
149+
148150
ENDIF(WIN32)
149151

150152
############################################################################################

Changelist.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
- fix node monitor, check keepalive
55
- fix java class path
66
- add tarsregistry log
7+
- fix build docker bug, copy tars2case to docker
78

89
### en
910
- 修改tarnode的监控逻辑, 增加keepalive的监控
1011
- 修改tarsnode java path
1112
- 增加tarsregistry日志
13+
- 修复build docker的bug, copy tars2case到容器中
1214

1315
## v2.4.5 2020.08.21
1416
### en

deploy/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM centos/systemd
22

33
#ENV MIRROR http://mirrors.cloud.tencent.com
44
ENV MIRROR http://mirrors.cloud.tencent.com
5-
ENV TARS_INSTALL /usr/local/tars/cpp/deploy/
5+
ENV TARS_INSTALL /usr/local/tars/cpp/deploy
66

77
COPY centos7_base.repo /etc/yum.repos.d/
88

@@ -20,12 +20,12 @@ RUN echo 'NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
2020
RUN source $HOME/.bashrc \
2121
&& export NVM_NODEJS_ORG_MIRROR=${MIRROR}/nodejs-release && nvm install v12.13.0
2222

23+
COPY tars2case ${TARS_INSTALL}/../tools/tars2case
2324
COPY framework ${TARS_INSTALL}/framework
2425
COPY tools ${TARS_INSTALL}/tools
2526
COPY docker-init.sh tars-install.sh tar-server.sh web-install.sh mysql-tool ${TARS_INSTALL}/
2627

27-
28-
RUN ${TARS_INSTALL}/tar-server.sh
28+
RUN chmod a+x ${TARS_INSTALL}/../tools/tars2case && ${TARS_INSTALL}/tar-server.sh
2929

3030
ENTRYPOINT [ "/usr/local/tars/cpp/deploy/docker-init.sh"]
3131

tarscpp

0 commit comments

Comments
 (0)