[feature] add client.machineIp to UI and static tailwind library

This commit is contained in:
ElevenNotes
2025-02-20 13:59:56 +01:00
parent 0ad0cd2171
commit cabd8fd912
3 changed files with 24 additions and 12 deletions

View File

@@ -53,6 +53,7 @@ jobs:
- name: init / checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
ref: ${{ github.ref_name }}
fetch-depth: 0
- name: init / inputs to env
@@ -259,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') != ''

View File

@@ -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; \

View File

@@ -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