From c0e183d351575e14eb99d0b79c404045cb15da18 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Tue, 21 Aug 2018 00:55:57 +0200 Subject: [PATCH] check flag before delete, adding pip in internal docker test --- server/debian/common/servercontainer_launch_auto.sh | 5 ++++- server/debian/stretch/x86_64/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/debian/common/servercontainer_launch_auto.sh b/server/debian/common/servercontainer_launch_auto.sh index 4362a95..0ea85fd 100755 --- a/server/debian/common/servercontainer_launch_auto.sh +++ b/server/debian/common/servercontainer_launch_auto.sh @@ -286,7 +286,10 @@ WHERE domain_id = 12;" || exit 2 # 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 ]] then msg_debug "start with screen" diff --git a/server/debian/stretch/x86_64/Dockerfile b/server/debian/stretch/x86_64/Dockerfile index a155b97..d90cac5 100644 --- a/server/debian/stretch/x86_64/Dockerfile +++ b/server/debian/stretch/x86_64/Dockerfile @@ -23,7 +23,7 @@ ENV HOSTNAME basic_server RUN apt-get update ; \ 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