changeset 27:27a754f8e8f8

deployment fixes
author drewp@bigasterisk.com
date Sat, 14 Oct 2023 17:08:36 -0700
parents 20fa84102643
children 1e058bea3ac2
files Dockerfile deploy_files.yaml deploy_ui.yaml pyproject.toml skaffold.yaml video.py
diffstat 6 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/Dockerfile	Thu Jun 29 13:57:47 2023 -0700
+++ b/Dockerfile	Sat Oct 14 17:08:36 2023 -0700
@@ -1,4 +1,4 @@
-FROM bang5:5000/base_basic
+FROM reg:5000/base_basic
 
 WORKDIR /opt
 
--- a/deploy_files.yaml	Thu Jun 29 13:57:47 2023 -0700
+++ b/deploy_files.yaml	Sat Oct 14 17:08:36 2023 -0700
@@ -21,7 +21,7 @@
             claimName: video-data
       containers:
         - name: files
-          image: bang5:5000/video_image
+          image: reg:5000/video_image
           # alternate: [ "webfsd", "-Fp", "9054", "-r", "/vids/" ]
           command:
             - pnpm
@@ -34,7 +34,7 @@
             - { name: data, mountPath: /data }
 
         - name: api
-          image: bang5:5000/video_image
+          image: reg:5000/video_image
           command:
             - pdm
             - run
--- a/deploy_ui.yaml	Thu Jun 29 13:57:47 2023 -0700
+++ b/deploy_ui.yaml	Sat Oct 14 17:08:36 2023 -0700
@@ -16,7 +16,7 @@
     spec:
       containers:
         - name: vite
-          image: bang5:5000/video_image
+          image: reg:5000/video_image
           command:
            - node_modules/.bin/vite
            - --debug
--- a/pyproject.toml	Thu Jun 29 13:57:47 2023 -0700
+++ b/pyproject.toml	Sat Oct 14 17:08:36 2023 -0700
@@ -8,7 +8,6 @@
 description = ""
 authors = [{ name = "Drew Perttula", email = "drewp@bigasterisk.com" }]
 dependencies = [
-    "cyclone",
     "docopt",
     "pymongo==3.10.1",
     "python-dateutil==2.8.1",
@@ -30,4 +29,4 @@
 [[tool.pdm.source]]
 url = "https://projects.bigasterisk.com/"
 verify_ssl = true
-name = "home"
\ No newline at end of file
+name = "home"
--- a/skaffold.yaml	Thu Jun 29 13:57:47 2023 -0700
+++ b/skaffold.yaml	Sat Oct 14 17:08:36 2023 -0700
@@ -1,24 +1,25 @@
-apiVersion: skaffold/v3
+apiVersion: skaffold/v4beta6
 kind: Config
 metadata:
   name: video
 build:
   artifacts:
-  - image: bang5:5000/video_image
-    sync:
-      infer:
-      - src/**
-      - '*.py'
-      - 'vite.config.ts'
+    - image: reg:5000/video_image
+      platforms: [amd64]
+      sync:
+        infer:
+          - src/**
+          - '*.py'
+          - vite.config.ts
   tagPolicy:
     dateTime:
       format: 2006-01-02_15-04-05
       timezone: Local
 manifests:
   rawYaml:
-  - volumes.yaml
-  - deploy_files.yaml
-  - deploy_ui.yaml
-  - ingress.yaml
+    - volumes.yaml
+    - deploy_files.yaml
+    - deploy_ui.yaml
+    - ingress.yaml
 deploy:
   kubectl: {}
--- a/video.py	Thu Jun 29 13:57:47 2023 -0700
+++ b/video.py	Sat Oct 14 17:08:36 2023 -0700
@@ -88,6 +88,7 @@
 
     app.add_middleware(PrometheusMiddleware, app_name='video_api')
     app.add_route("/video/api/metrics", handle_metrics)
+    app.add_route("/metrics", handle_metrics)
 
     app.state.processTask = asyncio.create_task(dl_queue.process())
     return app