Mercurial > code > home > repos > video

changeset 25:bf860a23d0c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deployment and metrics
author drewp@bigasterisk.com
date Thu, 29 Jun 2023 13:57:34 -0700
parents 1a9a8af1aa19
children 20fa84102643
files .hgignore Dockerfile deploy_files.yaml deploy_ui.yaml video.py
diffstat 5 files changed, 7 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Apr 17 13:35:18 2023 -0700
+++ b/.hgignore	Thu Jun 29 13:57:34 2023 -0700
@@ -3,3 +3,4 @@
 node_modules
 shaka-player
 vids
+.pdm-python
--- a/Dockerfile	Mon Apr 17 13:35:18 2023 -0700
+++ b/Dockerfile	Thu Jun 29 13:57:34 2023 -0700
@@ -1,20 +1,5 @@
 FROM bang5:5000/base_basic
 
-ENV KEYRING=/usr/share/keyrings/nodesource.gpg
-ENV VERSION=node_16.x
-ENV DISTRO=jammy
-RUN apt-get install -y gpg
-
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee "$KEYRING" >/dev/null && \
-  echo "deb [signed-by=$KEYRING] https://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list && \
-  echo "deb-src [signed-by=$KEYRING] https://deb.nodesource.com/$VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
-  apt-get update && \
-  apt-get remove -y nodejs libnode-dev libnode72 && \
-  apt-get install -y nodejs && \
-  apt autoremove -y && \
-  pnpm add -g pnpm
-
-RUN pnpm set registry "https://bigasterisk.com/js/"
 WORKDIR /opt
 
 RUN apt update && apt-get install -y git ffmpegthumbnailer
@@ -24,7 +9,6 @@
 
 COPY package.json pnpm-lock.yaml ./
 RUN pnpm install
-RUN pnpm add vite@4.3.0-beta.6
 
 COPY vite.config.ts serve-files.js ./
 COPY src/ ./src/
--- a/deploy_files.yaml	Mon Apr 17 13:35:18 2023 -0700
+++ b/deploy_files.yaml	Thu Jun 29 13:57:34 2023 -0700
@@ -11,7 +11,9 @@
     metadata:
       labels:
         app: video-files
-      annotations: { prometheus.io/scrape: "false" }
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8004"
     spec:
       volumes:
         - name: data
--- a/deploy_ui.yaml	Mon Apr 17 13:35:18 2023 -0700
+++ b/deploy_ui.yaml	Thu Jun 29 13:57:34 2023 -0700
@@ -11,7 +11,8 @@
     metadata:
       labels:
         app: video
-      annotations: { prometheus.io/scrape: "false" }
+      annotations:
+        prometheus.io/scrape: "false"
     spec:
       containers:
         - name: vite
--- a/video.py	Mon Apr 17 13:35:18 2023 -0700
+++ b/video.py	Thu Jun 29 13:57:34 2023 -0700
@@ -87,7 +87,7 @@
     )
 
     app.add_middleware(PrometheusMiddleware, app_name='video_api')
-    app.add_route("/metrics", handle_metrics)
+    app.add_route("/video/api/metrics", handle_metrics)
 
     app.state.processTask = asyncio.create_task(dl_queue.process())
     return app