From ddb99ddc1ea18d3ccbdfda392f14d5c5d0d96227 Mon Sep 17 00:00:00 2001
From: edgd1er <edgd1er@hotmail.com>
Date: Thu, 14 Apr 2022 01:48:06 +0200
Subject: [PATCH] add dnspython to docker image, add doc. #51
---
docker/docker-py3-kms-minimal/Dockerfile | 4 ++--
docker/docker-py3-kms/Dockerfile | 4 ++--
docs/Usage.md | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/docker/docker-py3-kms-minimal/Dockerfile b/docker/docker-py3-kms-minimal/Dockerfile
index 9d2b073..579e4ba 100644
--- a/docker/docker-py3-kms-minimal/Dockerfile
+++ b/docker/docker-py3-kms-minimal/Dockerfile
@@ -14,7 +14,7 @@ ENV LOGFILE STDOUT
ENV LOGSIZE ""
COPY ./py-kms /home/py-kms
-
+#hadolint ignore=DL3013,DL3018
RUN apk add --no-cache --update \
bash \
git \
@@ -28,7 +28,7 @@ RUN apk add --no-cache --update \
shadow \
netcat-openbsd \
build-base python3-dev \
- && pip3 install --no-cache peewee tzlocal pytz wheel \
+ && pip3 install --no-cache-dir peewee tzlocal pytz wheel dnspython \
&& apk del git build-base python3-dev \
&& addgroup power_users \
&& adduser -S py-kms -G users -s /bin/bash \
diff --git a/docker/docker-py3-kms/Dockerfile b/docker/docker-py3-kms/Dockerfile
index 480328d..2a8689d 100644
--- a/docker/docker-py3-kms/Dockerfile
+++ b/docker/docker-py3-kms/Dockerfile
@@ -36,7 +36,7 @@ RUN apk add --no-cache --update \
&& git clone --branch master --depth 1 https://github.com/coleifer/sqlite-web.git /tmp/sqlite_web \
&& mv /tmp/sqlite_web/sqlite_web /home/ \
&& rm -rf /tmp/sqlite_web \
- && pip3 install --no-cache-dir peewee tzlocal pytz pysqlite3 wheel \
+ && pip3 install --no-cache-dir peewee tzlocal pytz pysqlite3 wheel dnspython \
&& apk del git build-base python3-dev \
&& mkdir /db/ \
&& addgroup power_users \
@@ -52,7 +52,7 @@ COPY docker/start.py /usr/bin/start.py
RUN chmod 755 /usr/bin/entrypoint.py
WORKDIR /home/py-kms
-#USER py-kms
+
EXPOSE ${PORT}/tcp
EXPOSE 8080
diff --git a/docs/Usage.md b/docs/Usage.md
index 59674b4..ab69d66 100644
--- a/docs/Usage.md
+++ b/docs/Usage.md
@@ -143,6 +143,12 @@ user@host ~/path/to/folder/py-kms $ python3 pykms_Server.py -V DEBUG
user@host ~/path/to/folder/py-kms $ python3 pykms_Client.py -V DEBUG
```
+If you wish to get KMS server from DNS server: (ie perform a DNS resolution on _vlmcs._tcp.domain.tld). If ever there are several answers, only the first one is selected.
+```
+user@host ~/path/to/folder/py-kms $ python3 pykms_Server.py -V DEBUG -F STDOUT -D contoso.com
+user@host ~/path/to/folder/py-kms $ python3 pykms_Client.py -V DEBUG -F STDOUT -D contoso.com
+```
+
Or if you want better specify:
```
user@host ~/path/to/folder/py-kms $ python3 pykms_Server.py <YOUR_IPADDRESS> 1688 -V DEBUG