From 14fd52cc83ef979cdf3e7796d13c0e41d26c6e32 Mon Sep 17 00:00:00 2001 From: ElevenNotes Date: Fri, 7 Feb 2025 08:12:02 +0100 Subject: [PATCH] add LICENSE --- .github/workflows/docker.yml | 2 ++ LICENSE | 21 +++++++++++++++++++++ arch.dockerfile | 7 ++++++- rootfs/usr/local/bin/entrypoint.sh | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 LICENSE diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fc99076..c7125d5 100644 --- a/.github/workflows/docker.yml +++ b/.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 }} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4b9bb58 --- /dev/null +++ b/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. diff --git a/arch.dockerfile b/arch.dockerfile index f360e95..a3a6431 100644 --- a/arch.dockerfile +++ b/arch.dockerfile @@ -1,6 +1,8 @@ # :: Util FROM alpine AS util + ARG NO_CACHE + RUN set -ex; \ apk --no-cache --update add \ git; \ @@ -41,11 +43,14 @@ ENV APP_ROOT=${APP_ROOT} ENV PYKMS_SQLITE_DB_PATH=/kms/var/kms.db + ENV PYKMS_LICENSE_PATH=/opt/py-kms-gui/LICENSE + ENV PYKMS_VERSION_PATH=/opt/py-kms-gui ENV PORT=8080 # :: multi-stage COPY --from=util /docker-util/src/ /usr/local/bin COPY --from=build /opt/py-kms-gui/ /opt/py-kms-gui + COPY ./LICENSE /opt/py-kms-gui # :: Run USER root @@ -74,7 +79,7 @@ VOLUME ["${APP_ROOT}/var"] # :: Monitor - HEALTHCHECK --interval=5s --timeout=2s CMD curl -X GET -kILs --fail http://localhost:${PORT} || exit 1 + HEALTHCHECK --interval=5s --timeout=2s CMD curl -X GET -kILs --fail http://localhost:${PORT}/livez || exit 1 # :: Start USER docker \ No newline at end of file diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index 3e689c9..6712e25 100644 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -4,6 +4,7 @@ set -- "gunicorn" \ --log-level INFO \ pykms_WebUI:app + eleven log start fi