Merge pull request #45 from 6ec123321/master

Some small fixes for docker
This commit is contained in:
Matteo ℱan 2020-02-11 22:55:07 +01:00 committed by GitHub
commit 7d59066442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions

View File

@ -25,7 +25,7 @@ _py-kms_ is a port of node-kms created by [cyrozap](http://forums.mydigitallife.
# Usage # Usage
``` ```
docker run -d --name py3-kms \ docker run -it -d --name py3-kms \
-p 8080:8080 \ -p 8080:8080 \
-p 1688:1688 \ -p 1688:1688 \
-e IP=0.0.0.0 \ -e IP=0.0.0.0 \

View File

@ -50,7 +50,7 @@ ENV SQLITE false
# EN: hwid # EN: hwid
# RU: hwid # RU: hwid
ENV HWID 364F463A8863D35F ENV HWID "364F463A8863D35F"
# Use this flag to specify a HWID. # Use this flag to specify a HWID.
# The HWID must be an 16-character string of hex characters. # The HWID must be an 16-character string of hex characters.
# The default is "364F463A8863D35F" or type "RANDOM" to auto generate the HWID. # The default is "364F463A8863D35F" or type "RANDOM" to auto generate the HWID.
@ -107,7 +107,7 @@ chmod a+x /usr/bin/start.sh && \
# EN: Clear after install software # EN: Clear after install software
# RU: Очистка после установки программного обеспечения # RU: Очистка после установки программного обеспечения
apk del git py2-pip apk del git
# Set Workdir # Set Workdir
WORKDIR /home/py-kms WORKDIR /home/py-kms

View File

@ -1,6 +1,6 @@
docker stop py2-kms docker stop py2-kms
docker rm py2-kms docker rm py2-kms
docker run -d --name py2-kms \ docker run -it -d --name py2-kms \
-p 8080:8080 \ -p 8080:8080 \
-p 1688:1688 \ -p 1688:1688 \
-e IP=0.0.0.0 \ -e IP=0.0.0.0 \

View File

@ -27,25 +27,25 @@ else
then then
/bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &" /bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &"
sleep 5 sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 & /usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db /usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
else else
/bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} -S ${LOGSIZE} &" /bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} -S ${LOGSIZE} &"
sleep 5 sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 & /usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db /usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
fi fi
else else
if [ "$LOGSIZE" == "" ]; if [ "$LOGSIZE" == "" ];
then then
/bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &" /bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &"
sleep5 sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 & /usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db /usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
else else
/bin/sh -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} -S ${LOGSIZE} &" /bin/sh -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} -S ${LOGSIZE} &"
sleep 5 sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 & /usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db /usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
fi fi
fi fi

View File

@ -1,6 +1,6 @@
docker stop py3-kms docker stop py3-kms
docker rm py3-kms docker rm py3-kms
docker run -d --name py3-kms \ docker run -it -d --name py3-kms \
-p 8080:8080 \ -p 8080:8080 \
-p 1688:1688 \ -p 1688:1688 \
-e IP=0.0.0.0 \ -e IP=0.0.0.0 \

View File

@ -39,7 +39,7 @@ else
if [ "$LOGSIZE" == "" ]; if [ "$LOGSIZE" == "" ];
then then
/bin/bash -c "/usr/bin/python3 pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &" /bin/bash -c "/usr/bin/python3 pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &"
sleep5 sleep 5
/usr/bin/python3 pykms_Client.py ${IP} ${PORT} -m Windows10 & /usr/bin/python3 pykms_Client.py ${IP} ${PORT} -m Windows10 &
/usr/bin/python3 /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db --read-only /usr/bin/python3 /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db --read-only
else else