From 94f04be1081ed21aad9d10cc1999196e527a9625 Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Thu, 22 Aug 2024 12:09:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fixed=EF=BC=9AFixed=20missing=20icons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/package.json | 1 +
ui/public/icons/help.svg | 1 -
ui/public/icons/k8s.svg | 1 -
ui/public/icons/organize.svg | 1 -
ui/public/icons/setting.svg | 1 -
ui/public/icons/split.svg | 1 -
ui/public/icons/tree.svg | 1 -
ui/public/icons/user.svg | 1 -
ui/vite.config.ts | 10 +++++-----
9 files changed, 6 insertions(+), 12 deletions(-)
delete mode 100644 ui/public/icons/help.svg
delete mode 100644 ui/public/icons/k8s.svg
delete mode 100644 ui/public/icons/organize.svg
delete mode 100644 ui/public/icons/setting.svg
delete mode 100644 ui/public/icons/split.svg
delete mode 100644 ui/public/icons/tree.svg
delete mode 100644 ui/public/icons/user.svg
diff --git a/ui/package.json b/ui/package.json
index 54c4e9a1..d1cbea79 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,6 +4,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
+ "dev": "vite",
"serve": "vite",
"build": "vue-tsc -b && vite build",
"preview": "vite preview",
diff --git a/ui/public/icons/help.svg b/ui/public/icons/help.svg
deleted file mode 100644
index e5bdc1fb..00000000
--- a/ui/public/icons/help.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/public/icons/k8s.svg b/ui/public/icons/k8s.svg
deleted file mode 100644
index 4a4b34d9..00000000
--- a/ui/public/icons/k8s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/public/icons/organize.svg b/ui/public/icons/organize.svg
deleted file mode 100644
index 0d78983d..00000000
--- a/ui/public/icons/organize.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/public/icons/setting.svg b/ui/public/icons/setting.svg
deleted file mode 100644
index a8d64227..00000000
--- a/ui/public/icons/setting.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/public/icons/split.svg b/ui/public/icons/split.svg
deleted file mode 100644
index 2fdae88c..00000000
--- a/ui/public/icons/split.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/public/icons/tree.svg b/ui/public/icons/tree.svg
deleted file mode 100644
index 19b13eb6..00000000
--- a/ui/public/icons/tree.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/public/icons/user.svg b/ui/public/icons/user.svg
deleted file mode 100644
index 58a1fb7a..00000000
--- a/ui/public/icons/user.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index d4e04965..5de33ae9 100644
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -8,7 +8,6 @@ import vue from '@vitejs/plugin-vue';
import tailwindcss from 'tailwindcss';
import autoprefixer from 'autoprefixer';
import Components from 'unplugin-vue-components/vite';
-import viteCompression from 'vite-plugin-compression';
const pathResolve = (dir: string): string => {
return resolve(__dirname, '.', dir);
@@ -20,12 +19,13 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
return {
plugins: [
- vue(),
- manualChunksPlugin(),
createSvgIconsPlugin({
- iconDirs: [resolve(process.cwd(), 'src/public/icons')],
- symbolId: 'icon-[dir]-[name]'
+ iconDirs: [resolve(process.cwd(), 'src/assets/icons')],
+ symbolId: 'icon-[dir]-[name]',
+ inject: 'body-first'
}),
+ vue(),
+ manualChunksPlugin(),
Components({ dts: true, resolvers: [NaiveUiResolver()] })
],
resolve: {
From 485ec7e338abeca502f368e3644088f8a55ad337 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Thu, 22 Aug 2024 04:13:59 +0000
Subject: [PATCH 2/2] perf: Update Dockerfile with new base image tag
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7da91836..489f6738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/koko-base:20240821_064421 AS stage-build
+FROM jumpserver/koko-base:20240822_041030 AS stage-build
WORKDIR /opt/koko
ARG TARGETARCH
COPY . .