From 446eaa8b12e4840ea1d130d0364ad02381011d52 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Wed, 11 Apr 2018 22:55:54 +0200 Subject: [PATCH] download opennel-pymanager & use global script to configure khanat --- .gitlab-ci.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61356b3..d862e1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,7 @@ Linux server build: - mkdir -p /opt/download - export -p DIR_ARTEFACTS="/opt/download" - (cd /opt/download ; $WORKDIR/server/common/download_artefacts.sh 'https://git.khaganat.net' 'khaganat' 'mmorpg_khanat/khanat-opennel-code' $CI_COMMIT_REF_NAME 'develop' 'master') + - (cd /opt/download ; $WORKDIR/server/common/download_artefacts.sh 'https://git.khaganat.net' 'khaganat' 'mmorpg_khanat/opennel-pymanager' $CI_COMMIT_REF_NAME 'develop' 'master') - mkdir -p /opt/ext - cp $WORKDIR/server/debian/common/servercontainer_init_* /opt/ - cp $WORKDIR/server/debian/common/servercontainer_function.sh /opt/ @@ -78,14 +79,15 @@ Linux server build: - for file in /opt/artefacts/code/build/bin/* ; do ln -s $file /usr/local/bin ; done - for file in /opt/artefacts/code/build/lib/* ; do ln -s $file /usr/local/lib ; done - ldconfig - - /opt/ext/servercontainer_configure_link.sh - - /opt/ext/servercontainer_configure_mysql.sh -d - - /opt/ext/servercontainer_configure_apache.sh - - /opt/ext/servercontainer_configure_world.sh - - su -c '/opt/ext/servercontainer_configure_khanat.sh' gameserver - - su -c '/opt/ext/servercontainer_configure_patch.sh' gameserver - - su -c '/opt/ext/servercontainer_configure_launcher.sh' gameserver - - su -c 'touch /home/gameserver/khanat/step_configure.ok' gameserver + #- /opt/ext/servercontainer_configure_link.sh + #- /opt/ext/servercontainer_configure_mysql.sh + #- /opt/ext/servercontainer_configure_apache.sh + #- /opt/ext/servercontainer_configure_world.sh + #- su -c '/opt/ext/servercontainer_configure_khanat.sh' gameserver + #- su -c '/opt/ext/servercontainer_configure_patch.sh' gameserver + #- su -c '/opt/ext/servercontainer_configure_launcher.sh' gameserver + #- su -c 'touch /home/gameserver/khanat/step_configure.ok' gameserver + - /opt/ext/servercontainer_configure_auto.sh # Clean - rm -f /opt/servercontainer* # Create image