[comment] simpler styles path

This commit is contained in:
ElevenNotes
2025-02-20 15:16:12 +01:00
parent 026ad460f2
commit 1ba6193786
2 changed files with 11 additions and 11 deletions

View File

@@ -2,12 +2,12 @@ ARG APP_VERSION=stable
ARG APP_VERSION_PREFIX=""
ARG APP_VERSION_SUFFIX=""
# :: Build / templates
FROM alpine/git AS templates
# :: Build / styles
FROM alpine/git AS styles
RUN set -ex; \
git clone https://github.com/11notes/pykms-frontend.git; \
cd /git/pykms-frontend; \
git reset --hard 33777b8;
git reset --hard 9785b65;
# :: Header
FROM 11notes/kms:${APP_VERSION_PREFIX}${APP_VERSION}${APP_VERSION_SUFFIX}
@@ -60,15 +60,15 @@ ARG APP_VERSION_SUFFIX=""
# :: add multi template option
RUN set -ex; \
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; \
mkdir -p ${APP_ROOT}/styles/py-kms; \
mkdir -p ${APP_ROOT}/styles/custom-icon; \
cp -R /opt/py-kms/templates ${APP_ROOT}/styles/py-kms; \
cp -R /opt/py-kms/static ${APP_ROOT}/styles/py-kms; \
rm -rf /opt/py-kms/templates; \
rm -rf /opt/py-kms/static;
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
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
# :: set correct permissions
RUN set -ex; \

View File

@@ -9,7 +9,7 @@
# apply correct style
rm -rf /opt/py-kms/templates
rm -rf /opt/py-kms/static
TEMPLATE_DIR=${APP_ROOT}/.default/styles
TEMPLATE_DIR=${APP_ROOT}/styles
case ${KMS_GUI_STYLE} in
py-kms)
ln -s ${TEMPLATE_DIR}/py-kms/templates /opt/py-kms/templates
@@ -19,7 +19,7 @@
*)
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"
eleven log info "using custom-icon (default) GUI style"
;;
esac