drop KMS_ENHANCED_PRIVACY_ID

.dockerignore

@@ -1,5 +1,6 @@
 .git*
 *.md
 LICENSE
+img/
 maintain/
 project*

.github/workflows/docker.yml

@@ -77,6 +77,7 @@ jobs:
             APP_ROOT=${{ env.json_root }}
             APP_UID=${{ env.IMAGE_UID }}
             APP_GID=${{ env.IMAGE_GID }}
+            NO_CACHE=$(date +%s)
           tags: |
             ${{ env.json_image }}:grype
 
@@ -122,6 +123,7 @@ jobs:
             APP_ROOT=${{ env.json_root }}
             APP_UID=${{ env.IMAGE_UID }}
             APP_GID=${{ env.IMAGE_GID }}
+            NO_CACHE=$(date +%s)
           tags: |
             ${{ env.IMAGE_TAGS }}
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 11notes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -5,7 +5,8 @@
 
 **Activate any version of Windows and Office, forever**
 
-![slmgr](https://github.com/11notes/docker-kms/blob/main/slmgr.png?raw=true)
+![activation](https://github.com/11notes/docker-kms/blob/master/img/activation.png "Windows Server 2025 Datacenter")
+![GUI](https://github.com/11notes/docker-kms/blob/master/img/GUI.png "11notes/kms-gui")
 
 # SYNOPSIS 📖
 **What can I do with this?** This image will run a KMS server you can use to activate any version of Windows and Office, forever. If you need a GUI, simply add [11notes/kms-gui](https://github.com/11notes/docker-kms-gui) to your compose.
@@ -48,7 +49,7 @@ services:
       - "var:/kms/var"
     ports:
       - "1688:1688/tcp"
-    restart: always
+    restart: "always"
   kms-gui:
     image: "11notes/kms-gui:latest"
     container_name: "kms-gui"
@@ -58,7 +59,7 @@ services:
       - "var:/kms/var"
     ports:
       - "8080:8080/tcp"
-    restart: always
+    restart: "always"
 volumes:
   var:
 ```
@@ -93,11 +94,11 @@ slmgr /ato
 | Parameter | Value | Default |
 | --- | --- | --- |
 | `TZ` | [Time Zone](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) | |
-| `DEBUG` | Show debug messages from image **not** app | |
+| `DEBUG` | Will activate debug option for container image and app (if available) | |
 | `KMS_IP` | localhost or 127.0.0.1 or a dedicated IP | 0.0.0.0 |
 | `KMS_PORT` | any port > 1024 | 1688 |
 | `KMS_LOCALE` | see Microsoft LICD specification | 1033 (en-US) |
-| `KMS_CLIENTCOUNT` | client count >= 25 | 25 |
+| `KMS_CLIENTCOUNT` | client count > 25 | 26 |
 | `KMS_ACTIVATIONINTERVAL` | Retry unsuccessful after N minutes | 120 (2 hours) |
 | `KMS_RENEWALINTERVAL` | re-activation after N minutes | 259200 (180 days) |
 | `KMS_LOGLEVEL` | CRITICAL, ERROR, WARNING, INFO, DEBUG, MININFO | INFO |
@@ -112,10 +113,11 @@ slmgr /ato
 * [py-kms](https://github.com/Py-KMS-Organization/py-kms)
 * [alpine](https://alpinelinux.org)
 
-# TIPS 📌
+# GENERAL TIPS 📌
-* Use a reverse proxy like Traefik, Nginx, HAproxy to terminate TLS with a valid certificate
+* Use a reverse proxy like Traefik, Nginx, HAproxy to terminate TLS and to protect your endpoints
-* Use Let’s Encrypt certificates to protect your SSL endpoints
+* Use Let’s Encrypt DNS-01 challenge to obtain valid SSL certificates for your services
+* Do not expose this image to WAN! You will get notified from Microsoft via your ISP to terminate the service if you do so
 * [Microsoft LICD](https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a)
   
 # ElevenNotes™️
-This image is provided to you at your own risk. Always make backups before updating an image to a different version. Check the [releases](https://github.com/11notes/docker-kms/releases) for breaking changes. If you have any problems with using this image simply raise an [issue](https://github.com/11notes/docker-kms/issues), thanks . You can find all my repositories on [github](https://github.com/11notes?tab=repositories).
+This image is provided to you at your own risk. Always make backups before updating an image to a different version. Check the [releases](https://github.com/11notes/docker-kms/releases) for breaking changes. If you have any problems with using this image simply raise an [issue](https://github.com/11notes/docker-kms/issues), thanks. You can find all my repositories on [github](https://github.com/11notes?tab=repositories).

RELEASE.md

@@ -1,2 +1,2 @@
 ### 🪄 Features
-* switch to new github workflow and build process
+* drop KMS_ENHANCED_PRIVACY_ID

arch.dockerfile

@@ -1,37 +1,22 @@
 # :: Util
-  FROM alpine AS util
+  FROM alpine/git AS util
+
+  ARG NO_CACHE
 
   RUN set -ex; \
-    apk --no-cache --update add \
-      git; \
     git clone https://github.com/11notes/docker-util.git;
 
-# :: Build / redis
+# :: Build / py-kms
-  FROM python:3.12-alpine AS build
+  FROM alpine/git AS build
 
-  ARG TARGETARCH
   ARG APP_VERSION
 
-  USER root
-
   RUN set -ex; \
-    apk --update --no-cache add \
-      curl \
-      wget \
-      unzip \
-      build-base \
-      linux-headers \ 
-      make \
-      cmake \
-      g++ \
-      git; \
-    pip3 install --upgrade pip; \
-    pip3 install pyinstaller; \
     git clone https://github.com/Py-KMS-Organization/py-kms.git; \
-    cd /py-kms/py-kms; \
+    cd /git/py-kms; \
     git checkout ${APP_VERSION}; \
-    pyinstaller --onefile pykms_Server.py; \
+    cp -R /git/py-kms/docker/docker-py3-kms-minimal/requirements.txt /git/py-kms/py-kms/requirements.txt; \
-    cp /py-kms/py-kms/dist/pykms_Server /usr/local/bin;
+    cp -R /git/py-kms/docker/docker-py3-kms/requirements.txt /git/py-kms/py-kms/requirements.gui.txt;
 
 # :: Header
   FROM 11notes/alpine:stable
@@ -52,14 +37,14 @@
     ENV KMS_IP=0.0.0.0
     ENV KMS_PORT=1688
     ENV KMS_LOCALE=1033
-    ENV KMS_CLIENTCOUNT=25
+    ENV KMS_CLIENTCOUNT=26
     ENV KMS_ACTIVATIONINTERVAL=120
     ENV KMS_RENEWALINTERVAL=259200
     ENV KMS_LOGLEVEL="INFO"
 
   # :: multi-stage
-    COPY --from=util /docker-util/src/ /usr/local/bin
+    COPY --from=util /git/docker-util/src/ /usr/local/bin
-    COPY --from=build /usr/local/bin/ /usr/local/bin
+    COPY --from=build /git/py-kms/py-kms/ /opt/py-kms
 
   # :: Run
   USER root
@@ -67,19 +52,23 @@
   # :: install application
     RUN set -ex; \
       apk --no-cache --update add \
-        python3=3.12.8-r1;
+        python3=3.12.8-r1; \
+      apk --no-cache --update --virtual .build add \
+        py3-pip;
 
     RUN set -ex; \
       mkdir -p ${APP_ROOT}/var; \
-      touch /var/log/kms.log; \
+      pip3 install --no-cache-dir -r /opt/py-kms/requirements.txt --break-system-packages; \
-      ln -sf /dev/stdout /var/log/kms.log;
+      pip3 install --no-cache-dir pytz --break-system-packages; \
+      apk del --no-network .build;
 
   # :: copy filesystem changes and set correct permissions
     COPY ./rootfs /
     RUN set -ex; \
       chmod +x -R /usr/local/bin; \
       chown -R 1000:1000 \
-        ${APP_ROOT};
+        ${APP_ROOT} \
+        /opt/py-kms;
 
 # :: Volumes
   VOLUME ["${APP_ROOT}/var"]

compose.yaml

@@ -9,7 +9,7 @@ services:
       - "var:/kms/var"
     ports:
       - "1688:1688/tcp"
-    restart: always
+    restart: "always"
   kms-gui:
     image: "11notes/kms-gui:latest"
     container_name: "kms-gui"
@@ -19,6 +19,6 @@ services:
       - "var:/kms/var"
     ports:
       - "8080:8080/tcp"
-    restart: always
+    restart: "always"
 volumes:
   var:

rootfs/usr/local/bin/entrypoint.sh

@@ -1,7 +1,14 @@
 #!/bin/ash
   if [ -z "${1}" ]; then
-    eleven log start
+
-    set -- "pykms_Server" \
+    if [ ! -z "${DEBUG}" ]; then
+      KMS_LOGLEVEL="DEBUG"
+      eleven log debug "setting kms log level to DEBUG"
+    fi
+
+    cd /opt/py-kms
+    set -- "python3" \
+      pykms_Server.py \
       ${KMS_IP} \
       ${KMS_PORT} \
       -l ${KMS_LOCALE} \
@@ -11,8 +18,10 @@
       -s /kms/var/kms.db \
       -w RANDOM \
       -V ${KMS_LOGLEVEL} \
-      -F /var/log/kms.log \
+      -F STDOUT \
       -y
+    
+    eleven log start
   fi
 
   exec "$@"