Khaganat-NeL/khanat-server-docker-NeL
Khaganat-NeL/khanat-server-docker-NeL
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of ssh://git.khaganat.net:3543/khaganat/mmorpg_khanat/khanat-server-docker into develop

Browse source
This commit is contained in:
Jean Sorgemoel 2018-07-06 00:53:07 +02:00
commit 556b3ef43e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -99,11 +99,11 @@ Linux server build:
- for dir in /home/* ; do if [ $dir != '/home/gameserver' ] ; then option="$option --exclude=$dir" ; fi ; done - for dir in /home/* ; do if [ $dir != '/home/gameserver' ] ; then option="$option --exclude=$dir" ; fi ; done
- echo "option '$option'" - echo "option '$option'"
- find /home/gameserver -type d -exec du -sh {} \; - find /home/gameserver -type d -exec du -sh {} \;
- tar --numeric-owner --exclude=.git --exclude=.dockerenv --exclude=/proc --exclude=/sys --exclude=/builds --exclude=/opt/download --exclude=khanat-debian-server.tar.gz $option -cjf khanat-debian-server.tar.gz / - tar --numeric-owner --exclude=.git --exclude=.dockerenv --exclude=/proc --exclude=/sys --exclude=/builds --exclude=/opt/download --exclude=khanat-debian-server.tar.gz $option -czf khanat-debian-server.tar.gz /
- ls -lh khanat-debian-server.tar.gz - ls -lh khanat-debian-server.*
artifacts: artifacts:
name: "khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-server-debian-stretch" name: "khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-server-debian-stretch"
paths: paths:
- khanat-debian-server.tar.gz - khanat-debian-server.tar.bz2
expire_in: 2 hour expire_in: 2 hour

1
server/common/rootweb/index.php
View file

@ -86,6 +86,7 @@ print "SERVER IP: ". getHostByName(gethostname());
<div> <div>
script to download and convert launcher on our instance: script to download and convert launcher on our instance:
<a href="/prepare_environment_container_64.sh">prepare_environment_container_64.sh</a> <a href="/prepare_environment_container_64.sh">prepare_environment_container_64.sh</a>
aned after execute it.
</div> </div>
<div> <div>
Account / Password Account / Password