Merge branch 'master' of https://github.com/11notes/docker-kms-gui

.github/workflows/docker.yml

@@ -53,7 +53,8 @@ jobs:
       - name: init / checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: master
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
 
       - name: init / inputs to env
         if: github.event_name == 'workflow_dispatch'
@@ -200,12 +201,36 @@ jobs:
           tags: |
             ${{ env.IMAGE_TAGS }}
 
-      - name: github / create release notes
-        if: env.WORKFLOW_GITHUB_RELEASE == 'true' && hashFiles('RELEASE.md') != ''
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: github / release / log
+        id: git-log
         run: |
-          gh release create ${{ github.ref_name }} -F RELEASE.md
+          LOCAL_LAST_TAG=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`)
+          echo "using last tag: ${LOCAL_LAST_TAG}"
+          LOCAL_COMMITS=$(git log ${LOCAL_LAST_TAG}..HEAD --oneline)
+
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "commits<<${EOF}" >> ${GITHUB_OUTPUT}
+          echo "${LOCAL_COMMITS}" >> ${GITHUB_OUTPUT}
+          echo "${EOF}" >> ${GITHUB_OUTPUT}
+
+      - name: github / release / markdown
+        if: env.WORKFLOW_GITHUB_RELEASE == 'true'
+        id: git-release
+        uses: 11notes/action-docker-release@v1
+        with:
+          git_log: ${{ steps.git-log.outputs.commits }}
+
+      - name: github / release / create
+        if: env.WORKFLOW_GITHUB_RELEASE == 'true' && steps.git-release.outcome == 'success'
+        uses: actions/create-release@4c11c9fe1dcd9636620a16455165783b20fc7ea0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: ${{ steps.git-release.outputs.release }}
+          draft: false
+          prerelease: false
 
       - name: github / update description and set repo defaults
         run: |
@@ -235,11 +260,16 @@ jobs:
         continue-on-error: true
         if: steps.github-readme.outcome == 'success'
         run: |
+          echo "commit: $(git rev-parse --short HEAD)"
+          echo "ref_name: ${{ github.ref_name }}"
+          echo "base_ref: ${{ github.base_ref }}"
+          echo "head_ref: ${{ github.head_ref }}"
+          
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add .
-          git commit -m "update README.md"
-          git push
+          git commit -m "auto update README.md"
+          git push origin master
 
       - name: docker / push README.md to docker hub
         if: hashFiles('README.md') != ''

.inputs

@@ -1,4 +1,5 @@
 {
   "readme": "true",
-  "release": "false"
+  "release": "false",
+  "run-name": "docker"
 }

README.md

@@ -89,4 +89,4 @@ volumes:
 # 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-gui/releases) for breaking changes. If you have any problems with using this image simply raise an [issue](https://github.com/11notes/docker-kms-gui/issues), thanks. If you have a question or inputs please create a new [discussion](https://github.com/11notes/docker-kms-gui/discussions) instead of an issue. You can find all my other repositories on [github](https://github.com/11notes?tab=repositories).
 
-*created Wed, 19 Feb 2025 10:11:48 GMT*
+*created Thu, 20 Feb 2025 05:57:37 GMT*

RELEASE.md

@@ -1,2 +0,0 @@
-### 🪄 Features
-* add client IP to SQlite database

arch.dockerfile

@@ -5,9 +5,9 @@ ARG APP_VERSION_SUFFIX=""
 # :: Build / templates
   FROM alpine/git AS templates
   RUN set -ex; \
-    git clone https://github.com/CustomIcon/pykms-frontend.git; \
+    git clone https://github.com/11notes/pykms-frontend.git; \
     cd /git/pykms-frontend; \
-    git reset --hard 9e789a5;
+    git reset --hard 33777b8;
 
 # :: Header
   FROM 11notes/kms:${APP_VERSION_PREFIX}${APP_VERSION}${APP_VERSION_SUFFIX}
@@ -60,12 +60,15 @@ ARG APP_VERSION_SUFFIX=""
 
   # :: add multi template option
     RUN set -ex; \
-      mkdir -p ${APP_ROOT}/.default/templates/py-kms; \
-      mkdir -p ${APP_ROOT}/.default/templates/custom-icon; \
-      cp -R /opt/py-kms/templates/* ${APP_ROOT}/.default/templates/py-kms; \
-      rm -rf /opt/py-kms/templates;
+      mkdir -p ${APP_ROOT}/.default/styles/py-kms/templates; \
+      mkdir -p ${APP_ROOT}/.default/styles/custom-icon/templates; \
+      cp -R /opt/py-kms/templates/* ${APP_ROOT}/.default/styles/py-kms/templates; \
+      cp -R /opt/py-kms/static/* ${APP_ROOT}/.default/styles/py-kms/static; \
+      rm -rf /opt/py-kms/templates; \
+      rm -rf /opt/py-kms/static;
     
-    COPY --from=templates /git/pykms-frontend/templates/ ${APP_ROOT}/.default/templates/custom-icon
+    COPY --from=templates /git/pykms-frontend/templates ${APP_ROOT}/.default/styles/custom-icon/templates
+    COPY --from=templates /git/pykms-frontend/static ${APP_ROOT}/.default/styles/custom-icon/static
 
   # :: set correct permissions
     RUN set -ex; \

rootfs/usr/local/bin/entrypoint.sh

@@ -8,14 +8,17 @@
 
     # apply correct style
     rm -rf /opt/py-kms/templates
-    TEMPLATE_DIR=${APP_ROOT}/.default/templates
+    rm -rf /opt/py-kms/static
+    TEMPLATE_DIR=${APP_ROOT}/.default/styles
     case ${KMS_GUI_STYLE} in
       py-kms)
-        ln -s ${TEMPLATE_DIR}/py-kms /opt/py-kms/templates
+        ln -s ${TEMPLATE_DIR}/py-kms/templates /opt/py-kms/templates
+        ln -s ${TEMPLATE_DIR}/py-kms/static /opt/py-kms/static
         eleven log info "using ${KMS_GUI_STYLE} GUI style"
       ;;
       *)
-        ln -s ${TEMPLATE_DIR}/custom-icon /opt/py-kms/templates
+        ln -s ${TEMPLATE_DIR}/custom-icon/templates /opt/py-kms/templates
+        ln -s ${TEMPLATE_DIR}/custom-icon/static /opt/py-kms/static
         eleven log info "using default GUI style"
       ;;
     esac