changeset 9:9e94454560de

some vite cleanup and a test of the ingest/ page
author drewp@bigasterisk.com
date Sat, 15 Apr 2023 15:18:18 -0700
parents f80f8c22752d
children 9b43b7596633
files Dockerfile index.html ingress.yaml skaffold.yaml src/index.html src/ingest/index.html vite.config.ts
diffstat 7 files changed, 58 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/Dockerfile	Sun Apr 09 19:37:05 2023 -0700
+++ b/Dockerfile	Sat Apr 15 15:18:18 2023 -0700
@@ -25,7 +25,7 @@
 COPY package.json pnpm-lock.yaml ./
 RUN pnpm install
 
-COPY index.html vite.config.ts serve-files.js ./
+COPY vite.config.ts serve-files.js ./
 COPY src/ ./src/
 
 COPY video.py video_service.py ./
--- a/index.html	Sun Apr 09 19:37:05 2023 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>video on bigasterisk</title>
-    <link rel="stylesheet" type="text/css" media="screen" href="src/main.css" />
-    <script type="module" src="src/main.ts"></script>
-  </head>
-  <body>
-    <video-page></video-page>
-  </body>
-</html>
--- a/ingress.yaml	Sun Apr 09 19:37:05 2023 -0700
+++ b/ingress.yaml	Sat Apr 15 15:18:18 2023 -0700
@@ -1,3 +1,28 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: video-ingest
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    ingress.pomerium.io/allow_public_unauthenticated_access: "false"
+    ingress.pomerium.io/pass_identity_headers: "true"
+    ingress.pomerium.io/preserve_host_header: "true"
+    ingress.pomerium.io/policy: |
+      allow:
+        or: 
+    ingress.pomerium.io/allow_websockets: "true"
+spec:
+  ingressClassName: pomerium
+  rules:
+    - host: "bigasterisk.com"
+      http:
+        paths:
+          - { pathType: Prefix, path: /video/ingest/,     backend: { service: { name: video,       port: { name: vite } } } }
+          - { pathType: Prefix, path: /video/api/ingest/, backend: { service: { name: video-files, port: { name: api } } } }
+  tls:
+    - hosts: [bigasterisk.com]
+      secretName: bigasterisk.com-tls
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
--- a/skaffold.yaml	Sun Apr 09 19:37:05 2023 -0700
+++ b/skaffold.yaml	Sat Apr 15 15:18:18 2023 -0700
@@ -7,9 +7,9 @@
   - image: bang5:5000/video_image
     sync:
       infer:
-      - index.html
       - src/*
       - '*.py'
+      - 'vite.config.ts'
   tagPolicy:
     dateTime:
       format: 2006-01-02_15-04-05
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/index.html	Sat Apr 15 15:18:18 2023 -0700
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>video on bigasterisk</title>
+    <link rel="stylesheet" type="text/css" media="screen" href="./main.css" />
+    <script type="module" src="./main.ts"></script>
+  </head>
+  <body>
+    <video-page></video-page>
+  </body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ingest/index.html	Sat Apr 15 15:18:18 2023 -0700
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>video on bigasterisk</title>
+    <link rel="stylesheet" type="text/css" media="screen" href="./main.css" />
+    <script type="module" src="./main.ts"></script>
+  </head>
+  <body>
+
+    <h1>Video library ingest</h1>
+    <ingest-drop></ingest-drop>
+    
+    <h2>Processing</h2>
+    <ingest-status></ingest-status>
+
+  </body>
+</html>
--- a/vite.config.ts	Sun Apr 09 19:37:05 2023 -0700
+++ b/vite.config.ts	Sat Apr 15 15:18:18 2023 -0700
@@ -1,7 +1,7 @@
 import { defineConfig } from "vite";
 
 export default defineConfig({
-  base: "https://bigasterisk.com/video/",
+  base: "/video/",
   server: {
     host: "0.0.0.0",
     strictPort: true,
@@ -9,6 +9,7 @@
     hmr: { path: "vite-ws" },
     fs: { allow: ["src", "node_modules", "."] },
   },
+  root: "src",
   build: {
     assetsDir: "src",
     target: "esnext",
@@ -16,14 +17,8 @@
       entry: "src/index.ts",
       formats: ["es"],
     },
-    rollupOptions: {
-      // input: { app: "src/index.html" },
-      external: /^lit/,
-    },
   },
-  resolve: {
-    alias: [{ find: "rdf-canonize-native", replacement: "" }],
-  },
+ 
   define: {
     global: {},
   },