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

adding option to start container docker

Browse source
This commit is contained in:
AleaJactaEst 2018-07-26 09:35:11 +02:00
parent d607c736e0
commit fa4301a6d9
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/debian/stretch/x86_64/server-container.sh
View file

@ -36,6 +36,7 @@ declare -i SHOWIPKHANATSERVER=0
declare METHODSTARTSERVER="--start-khanat-with-screen" declare METHODSTARTSERVER="--start-khanat-with-screen"
declare -i CLEANIMAGENONE=0 declare -i CLEANIMAGENONE=0
declare DOCKERBUILDOPT="" declare DOCKERBUILDOPT=""
declare DOCKERRUNOPT=""
declare CONFIGUREAUTO="" declare CONFIGUREAUTO=""
declare UPDATEAUTO="" declare UPDATEAUTO=""
@ -81,6 +82,7 @@ options:
-w, --clean-images-none : Remove images docker (with name 'none') -w, --clean-images-none : Remove images docker (with name 'none')
-i, --show-ip-khanat-server : show ip address for khanat server (launch under docker) -i, --show-ip-khanat-server : show ip address for khanat server (launch under docker)
--option-docker-build=[STRING] : you can add option in "docker build" --option-docker-build=[STRING] : you can add option in "docker build"
--option-docker-run=[STRING] : you can add option in "docker run"
--khanat-ressources-dir=[DIR] : localization khanat-ressources --khanat-ressources-dir=[DIR] : localization khanat-ressources
--khanat-client-data-dir=[DIR] : localization khanat-client-data --khanat-client-data-dir=[DIR] : localization khanat-client-data
--opennel-code-dir=[DIR] : localization opennel-code --opennel-code-dir=[DIR] : localization opennel-code
@ -238,6 +240,10 @@ do
DOCKERBUILDOPT="$DOCKERBUILDOPT ${1#*=}" DOCKERBUILDOPT="$DOCKERBUILDOPT ${1#*=}"
shift shift
;; ;;
--option-docker-run=*)
DOCKERRUNOPT="$DOCKERRUNOPT ${1#*=}"
shift
;;
*) *)
msg_error "[$(basename $0):$LINENO] options '$1' not recognize" msg_error "[$(basename $0):$LINENO] options '$1' not recognize"
usage usage
@ -522,7 +528,7 @@ fi
if [[ $LAUNCHKHANAT -ne 0 ]] if [[ $LAUNCHKHANAT -ne 0 ]]
then then
msg_info "[$(basename $0):$LINENO] START KHANAT SERVER" msg_info "[$(basename $0):$LINENO] START KHANAT SERVER"
cd $rootdir; docker run -it --hostname=khanat \ cd $rootdir; docker run -it $DOCKERRUNOPT --hostname=khanat \
-u "$(id -u $USERNAME):$(id -g $USERNAME)" \ -u "$(id -u $USERNAME):$(id -g $USERNAME)" \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-v ${rootdir}/${LOCALBUILDDIR}/bin:/usr/local/bin:ro \ -v ${rootdir}/${LOCALBUILDDIR}/bin:/usr/local/bin:ro \