From 041df7f5ce9d02d2742fc355be5e76e770909be1 Mon Sep 17 00:00:00 2001 From: 6ec123321 Date: Mon, 18 Nov 2019 19:30:08 +0400 Subject: [PATCH] Work with py2 --- docker/README.md | 2 +- docker/docker-py2-kms/Dockerfile | 4 ++-- docker/docker-py2-kms/run-py2-kms.sh | 2 +- docker/docker-py2-kms/start.sh | 8 ++++---- docker/docker-py3-kms/run-py3-kms.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/README.md b/docker/README.md index eb64bca..e21f0b8 100644 --- a/docker/README.md +++ b/docker/README.md @@ -25,7 +25,7 @@ _py-kms_ is a port of node-kms created by [cyrozap](http://forums.mydigitallife. # Usage ``` -docker run -d --name py3-kms \ +docker run -it -d --name py3-kms \ -p 8080:8080 \ -p 1688:1688 \ -e IP=0.0.0.0 \ diff --git a/docker/docker-py2-kms/Dockerfile b/docker/docker-py2-kms/Dockerfile index d8dabfd..8c7aa72 100644 --- a/docker/docker-py2-kms/Dockerfile +++ b/docker/docker-py2-kms/Dockerfile @@ -50,7 +50,7 @@ ENV SQLITE false # EN: hwid # RU: hwid -ENV HWID 364F463A8863D35F +ENV HWID "364F463A8863D35F" # Use this flag to specify a HWID. # The HWID must be an 16-character string of hex characters. # 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 # RU: Очистка после установки программного обеспечения -apk del git py2-pip +apk del git # Set Workdir WORKDIR /home/py-kms diff --git a/docker/docker-py2-kms/run-py2-kms.sh b/docker/docker-py2-kms/run-py2-kms.sh index 64cc84f..03aaa82 100755 --- a/docker/docker-py2-kms/run-py2-kms.sh +++ b/docker/docker-py2-kms/run-py2-kms.sh @@ -1,6 +1,6 @@ docker stop py2-kms docker rm py2-kms -docker run -d --name py2-kms \ +docker run -it -d --name py2-kms \ -p 8080:8080 \ -p 1688:1688 \ -e IP=0.0.0.0 \ diff --git a/docker/docker-py2-kms/start.sh b/docker/docker-py2-kms/start.sh index 08a85a0..2d62620 100644 --- a/docker/docker-py2-kms/start.sh +++ b/docker/docker-py2-kms/start.sh @@ -27,12 +27,12 @@ else 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} &" 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 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} &" 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 fi else @@ -40,12 +40,12 @@ else 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} &" sleep5 - /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 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} &" 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 fi fi diff --git a/docker/docker-py3-kms/run-py3-kms.sh b/docker/docker-py3-kms/run-py3-kms.sh index 849cff0..098712e 100755 --- a/docker/docker-py3-kms/run-py3-kms.sh +++ b/docker/docker-py3-kms/run-py3-kms.sh @@ -1,6 +1,6 @@ docker stop py3-kms docker rm py3-kms -docker run -d --name py3-kms \ +docker run -it -d --name py3-kms \ -p 8080:8080 \ -p 1688:1688 \ -e IP=0.0.0.0 \