# HG changeset patch # User drewp@bigasterisk.com # Date 1697328516 25200 # Node ID 27a754f8e8f81fd4e1d6e6a56a788a122ab22590 # Parent 20fa8410264311f1c8e255e02fecb47f9aff7b3d deployment fixes diff -r 20fa84102643 -r 27a754f8e8f8 Dockerfile --- 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 diff -r 20fa84102643 -r 27a754f8e8f8 deploy_files.yaml --- 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 diff -r 20fa84102643 -r 27a754f8e8f8 deploy_ui.yaml --- 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 diff -r 20fa84102643 -r 27a754f8e8f8 pyproject.toml --- 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" diff -r 20fa84102643 -r 27a754f8e8f8 skaffold.yaml --- 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: {} diff -r 20fa84102643 -r 27a754f8e8f8 video.py --- 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