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

check flag before delete, adding pip in internal docker test

Browse source
This commit is contained in:
AleaJactaEst 2018-08-21 00:55:57 +02:00
parent 7d3165c320
commit c0e183d351
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/debian/common/servercontainer_launch_auto.sh
View file

@ -286,7 +286,10 @@ WHERE domain_id = 12;" || exit 2
# Start khanat # Start khanat
##################### #####################
msg_debug "Start khanat" msg_debug "Start khanat"
rm /home/gameserver/opennelmanager.flag || echo "" if [ -f /home/gameserver/opennelmanager.flag ]
then
rm /home/gameserver/opennelmanager.flag || exit 2
fi
if [[ $METHOD_START -eq 0 ]] if [[ $METHOD_START -eq 0 ]]
then then
msg_debug "start with screen" msg_debug "start with screen"

2
server/debian/stretch/x86_64/Dockerfile
View file

@ -23,7 +23,7 @@ ENV HOSTNAME basic_server
RUN apt-get update ; \ RUN apt-get update ; \
apt-get dist-upgrade -y ; \ apt-get dist-upgrade -y ; \
DEBIAN_FRONTEND=noninteractive apt-get install -y curl nano vim less bash-completion cron logrotate bsd-mailx openssh-server sudo net-tools lzma xdelta p7zip p7zip-full mysql-server apache2 php libapache2-mod-php php-mysql apache2-utils php-gd php-imagick rrdtool screen mcrypt php-mcrypt python3 phpmyadmin gdb valgrind electric-fence python3-pip python3-bcrypt DEBIAN_FRONTEND=noninteractive apt-get install -y curl nano vim less bash-completion cron logrotate bsd-mailx openssh-server sudo net-tools lzma xdelta p7zip p7zip-full mysql-server apache2 php libapache2-mod-php php-mysql apache2-utils php-gd php-imagick rrdtool screen mcrypt php-mcrypt python3 phpmyadmin gdb valgrind electric-fence python3-pip python3-bcrypt python3-pip