From c631b194c4953f9d003c45ad09cdf55c32966221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= Date: Sun, 5 Sep 2021 22:02:29 +0800 Subject: [PATCH] Update image location for k8s changes --- .../src/Astro/Blog/AstroEdit/SiteLibrary.css | 2 +- .../Blog/AstroEdit/Visualizer/Snippet/Sound.js | 2 +- botanjs/src/Astro/Blog/AstroEdit/_this.css | 2 +- .../src/Astro/Blog/Components/Notification.css | 2 +- botanjs/src/Astro/Blog/Layout/ErrorPages.css | 8 ++++---- botanjs/src/Astro/Starfall/Element/Footer.css | 2 +- botanjs/src/Astro/Starfall/Element/Header.css | 2 +- k8s.yaml | 18 +++++++++++------- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css b/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css index e25068a..dc40590 100644 --- a/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css +++ b/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css @@ -96,7 +96,7 @@ } .asl_smask[expand] { - background-image: url(/assets/layout-images/collapse.png); + background-image: url(/assets/blog/layout-images/collapse.png); background-position: center 2.5px; background-repeat: no-repeat; } diff --git a/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js b/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js index b8aa977..bb9778c 100644 --- a/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js +++ b/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js @@ -18,7 +18,7 @@ var sound = function (insertSnippet, snippetWrap, createContext, override) { var temp, i, j - , defaultArt = "/assets/layout-images/disc_s.png" + , defaultArt = "/assets/blog/layout-images/disc_s.png" , handler = function () { // Input fields diff --git a/botanjs/src/Astro/Blog/AstroEdit/_this.css b/botanjs/src/Astro/Blog/AstroEdit/_this.css index 37a262b..7a14d20 100644 --- a/botanjs/src/Astro/Blog/AstroEdit/_this.css +++ b/botanjs/src/Astro/Blog/AstroEdit/_this.css @@ -221,7 +221,7 @@ } .ae_expand_btn, .ae_callapse_btn { - background: url(/assets/layout-images/collapse.png) center 2.5px no-repeat; + background: url(/assets/blog/layout-images/collapse.png) center 2.5px no-repeat; width: 100%; height: 10px; } diff --git a/botanjs/src/Astro/Blog/Components/Notification.css b/botanjs/src/Astro/Blog/Components/Notification.css index 7f60969..ff3e554 100644 --- a/botanjs/src/Astro/Blog/Components/Notification.css +++ b/botanjs/src/Astro/Blog/Components/Notification.css @@ -113,7 +113,7 @@ padding: 0em 0.2em; width: 2em; height: 2em; - background: #333 url(/assets/layout-images/settings.png) no-repeat center center; + background: #333 url(/assets/blog/layout-images/settings.png) no-repeat center center; background-size: 1.5em 1.5em; } diff --git a/botanjs/src/Astro/Blog/Layout/ErrorPages.css b/botanjs/src/Astro/Blog/Layout/ErrorPages.css index 395964c..cd63115 100644 --- a/botanjs/src/Astro/Blog/Layout/ErrorPages.css +++ b/botanjs/src/Astro/Blog/Layout/ErrorPages.css @@ -58,9 +58,9 @@ html, body { height: 100%; } height: 90px; } -.c401 { background: url(/assets/layout-images/errorcodes.png) 0 0; } -.c403 { background: url(/assets/layout-images/errorcodes.png) 200px 0; } -.c404 { background: url(/assets/layout-images/errorcodes.png) 0 90px; } +.c401 { background: url(/assets/blog/layout-images/errorcodes.png) 0 0; } +.c403 { background: url(/assets/blog/layout-images/errorcodes.png) 200px 0; } +.c404 { background: url(/assets/blog/layout-images/errorcodes.png) 0 90px; } .b401 { background: cornflowerblue; } .b403 { background: crimson; } @@ -89,7 +89,7 @@ html, body { height: 100%; } margin-left: -200px; margin-top: -200px; - background: url(/assets/layout-images/ring.png) center center no-repeat; + background: url(/assets/blog/layout-images/ring.png) center center no-repeat; } diff --git a/botanjs/src/Astro/Starfall/Element/Footer.css b/botanjs/src/Astro/Starfall/Element/Footer.css index 626319d..5d2eb46 100644 --- a/botanjs/src/Astro/Starfall/Element/Footer.css +++ b/botanjs/src/Astro/Starfall/Element/Footer.css @@ -1,6 +1,6 @@ footer { background-color: #222; - background-image: url(/assets/layout-images/lines.png); + background-image: url(/assets/blog/layout-images/lines.png); background-repeat: no-repeat; background-position: right bottom; } diff --git a/botanjs/src/Astro/Starfall/Element/Header.css b/botanjs/src/Astro/Starfall/Element/Header.css index 041a98d..230f4c1 100644 --- a/botanjs/src/Astro/Starfall/Element/Header.css +++ b/botanjs/src/Astro/Starfall/Element/Header.css @@ -158,7 +158,7 @@ header { left: 0; width: 100%; height: 100%; - background:url(/assets/layout-images/collapse.png) center 2.5px no-repeat; + background:url(/assets/blog/layout-images/collapse.png) center 2.5px no-repeat; } #collapse_panel:hover { diff --git a/k8s.yaml b/k8s.yaml index e20e297..b8e8ac5 100644 --- a/k8s.yaml +++ b/k8s.yaml @@ -19,7 +19,7 @@ spec: path: /srv/astrostorage containers: - name: web - image: 192.168.80.4:32000/sites/astrojs:b00031 + image: 192.168.80.4:32000/sites/astrojs:b00032 volumeMounts: - mountPath: "/app/cache" name: astrojs-cache @@ -33,7 +33,7 @@ spec: - name: redis image: redis:6.0.8-alpine - name: compiler - image: 192.168.80.4:32000/sites/astrojs:b00031 + image: 192.168.80.4:32000/sites/astrojs:b00032 volumeMounts: - mountPath: "/app/cache" name: astrojs-cache @@ -56,15 +56,19 @@ spec: --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: astrojs spec: rules: - - host: botanjs.botanical.astropenguin.net + - host: botanjs.astropenguin.net http: paths: - - backend: - serviceName: astrojs - servicePort: 5000 + - path: "/" + pathType: Prefix + backend: + service: + name: astrojs + port: + number: 5000