Skip to content

Commit

Permalink
fix build docker bug, copy tars2case to docker
Browse files Browse the repository at this point in the history
  • Loading branch information
ruanshudong committed Sep 3, 2020
1 parent 5c50b55 commit 517915c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ else(WIN32)
install(DIRECTORY deploy DESTINATION ./
PATTERN "*.sh"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
install(FILES ${PROJECT_BINARY_DIR}/bin/tars2case DESTINATION deploy)

ENDIF(WIN32)

############################################################################################
Expand Down
2 changes: 2 additions & 0 deletions Changelist.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
- fix node monitor, check keepalive
- fix java class path
- add tarsregistry log
- fix build docker bug, copy tars2case to docker

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

## v2.4.5 2020.08.21
### en
Expand Down
6 changes: 3 additions & 3 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM centos/systemd

#ENV MIRROR http://mirrors.cloud.tencent.com
ENV MIRROR http://mirrors.cloud.tencent.com
ENV TARS_INSTALL /usr/local/tars/cpp/deploy/
ENV TARS_INSTALL /usr/local/tars/cpp/deploy

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

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

COPY tars2case ${TARS_INSTALL}/../tools/tars2case
COPY framework ${TARS_INSTALL}/framework
COPY tools ${TARS_INSTALL}/tools
COPY docker-init.sh tars-install.sh tar-server.sh web-install.sh mysql-tool ${TARS_INSTALL}/


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

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

Expand Down
2 changes: 1 addition & 1 deletion tarscpp
Submodule tarscpp updated 1 files
+1 −1 servant/protocol

0 comments on commit 517915c

Please sign in to comment.