From 8ff275bb7a554e1bc7ac355b48af34b09de9e0dc Mon Sep 17 00:00:00 2001
From: ElevenNotes <github@11notes.ch>
Date: Mon, 5 May 2025 10:56:26 +0200
Subject: [PATCH] [upgrade] to fork for default skin and semver for base image

---
 .json           |  7 +++----
 arch.dockerfile | 23 +++++++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.json b/.json
index 16fbd63..3b613e0 100644
--- a/.json
+++ b/.json
@@ -4,17 +4,16 @@
   "root":"/kms",
   
   "semver":{
-    "version":"465f4d1"
+    "version":"1.0.0"
   },
 
   "readme":{
     "description":"Activate any version of Windows and Office, forever",
     "parent":{
-      "image":"11notes/kms:465f4d1"
+      "image":"11notes/kms:1.0.0"
     },
     "built":{
-      "py-kms":"https://github.com/Py-KMS-Organization/py-kms",
-      "CustomIcon/pykms-frontend":"https://github.com/CustomIcon/pykms-frontend"
+      "11notes/fork-pykms-frontend":"https://github.com/11notes/fork-pykms-frontend"
     }
   }
 }
\ No newline at end of file
diff --git a/arch.dockerfile b/arch.dockerfile
index f51eb2a..3bc791c 100644
--- a/arch.dockerfile
+++ b/arch.dockerfile
@@ -3,13 +3,15 @@ ARG APP_PREFIX=""
 ARG APP_SUFFIX=""
 ARG APP_UID=1000
 ARG APP_GID=1000
+ARG BUILD_ROOT=/git/fork-pykms-frontend
 
 # :: Build / styles
   FROM alpine/git AS styles
   ARG APP_NO_CACHE
+  ARG BUILD_ROOT
   RUN set -ex; \
-    git clone https://github.com/11notes/pykms-frontend.git; \
-    cd /git/pykms-frontend;
+    git clone https://github.com/11notes/fork-pykms-frontend.git; \
+    cd ${BUILD_ROOT};
 
 # :: Header
   FROM 11notes/kms:${APP_PREFIX}${APP_VERSION}${APP_SUFFIX}
@@ -23,6 +25,13 @@ ARG APP_GID=1000
     ARG APP_UID
     ARG APP_GID
     ARG APP_NO_CACHE
+    ARG BUILD_ROOT
+
+    # :: python image
+      ARG PIP_ROOT_USER_ACTION=ignore
+      ARG PIP_BREAK_SYSTEM_PACKAGES=1
+      ARG PIP_DISABLE_PIP_VERSION_CHECK=1
+      ARG PIP_NO_CACHE_DIR=1
 
   # :: environment
     ENV APP_IMAGE=${APP_IMAGE}
@@ -38,8 +47,6 @@ ARG APP_GID=1000
     ENV PORT=3000
     ENV LOG_LEVEL=INFO
 
-    ENV PIP_ROOT_USER_ACTION=ignore
-
   # :: multi-stage
     COPY ./LICENSE /opt/py-kms
 
@@ -57,8 +64,8 @@ ARG APP_GID=1000
       cd /opt/py-kms; \
       echo "${APP_VERSION}" > VERSION; \
       echo "master" >> VERSION; \
-      pip3 install --no-cache-dir --break-system-packages -r /opt/py-kms/requirements.gui.txt; \
-      pip3 list -o | sed 's/pip.*//' | grep . | cut -f1 -d' ' | tr " " "\n" | awk '{if(NR>=3)print}' | cut -d' ' -f1 | xargs -n1 pip3 install --no-cache-dir --break-system-packages -U; \
+      pip3 install -r /opt/py-kms/requirements.gui.txt; \
+      pip3 list -o | sed 's/pip.*//' | grep . | cut -f1 -d' ' | tr " " "\n" | awk '{if(NR>=3)print}' | cut -d' ' -f1 | xargs -n1 pip3 install -U; \
       apk del --no-network .build; \
       rm -rf /usr/lib/python3.12/site-packages/pip;
 
@@ -74,8 +81,8 @@ ARG APP_GID=1000
       rm -rf /opt/py-kms/templates; \
       rm -rf /opt/py-kms/static;
     
-    COPY --from=styles /git/pykms-frontend/templates ${APP_ROOT}/styles/custom-icon/templates
-    COPY --from=styles /git/pykms-frontend/static ${APP_ROOT}/styles/custom-icon/static
+    COPY --from=styles ${BUILD_ROOT}/templates ${APP_ROOT}/styles/custom-icon/templates
+    COPY --from=styles ${BUILD_ROOT}/static ${APP_ROOT}/styles/custom-icon/static
 
   # :: set correct permissions
     RUN set -ex; \