From 6539cac0d9264d8f300b73aee5021c571592488b Mon Sep 17 00:00:00 2001 From: TommyLike Date: Wed, 24 May 2023 17:16:15 +0800 Subject: [PATCH 1/2] Fix singatrust app issue --- .gitignore | 22 +++++++++++++++++++++- Makefile | 3 +++ app/.gitignore | 24 ------------------------ app/Dockerfile | 14 ++++---------- app/deploy/nginx/nginx.conf | 17 ++--------------- app/package.json | 2 +- app/src/before.ts | 4 ---- app/src/main.ts | 1 - app/src/pages/listShow/CreatePgp.vue | 3 --- app/src/router.ts | 6 ------ app/vite.config.ts | 3 +-- 11 files changed, 32 insertions(+), 67 deletions(-) delete mode 100644 app/.gitignore delete mode 100644 app/src/before.ts diff --git a/.gitignore b/.gitignore index 90c8081..ab2dbab 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,24 @@ Cargo.lock /target .idea/ -.data \ No newline at end of file +.data +app/logs +app/*.log +app/npm-debug.log* +app/yarn-debug.log* +app/yarn-error.log* +app/pnpm-debug.log* +app/lerna-debug.log* +app/node_modules +app/dist +app/dist-ssr + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/Makefile b/Makefile index b3ce382..78d10aa 100644 --- a/Makefile +++ b/Makefile @@ -25,5 +25,8 @@ control-server-image: control-admin-image: docker build -t tommylike/signatrust-control-admin:$(GIT_COMMIT) --build-arg BINARY=control-admin -f Dockerfile . +app-image: + docker build -t tommylike/signatrust-app:$(GIT_COMMIT) -f app/Dockerfile ./app + deploy-local: kustomize build ./deploy | kubectl apply -f - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index a547bf3..0000000 --- a/app/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* -lerna-debug.log* - -node_modules -dist -dist-ssr -*.local - -# Editor directories and files -.vscode/* -!.vscode/extensions.json -.idea -.DS_Store -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? diff --git a/app/Dockerfile b/app/Dockerfile index 91fa0e2..9cc4c21 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,22 +1,16 @@ FROM gplane/pnpm as Builder -RUN mkdir -p /home/openeuler-certificate/web -WORKDIR /home/openeuler-certificate/web -COPY . /home/openeuler-certificate/web - +RUN mkdir -p /home/signatrust/app +WORKDIR /home/signatrust/app +COPY . /home/signatrust/app RUN pnpm install - RUN pnpm build -# FROM nginx:1.20.0 - -# COPY ./deploy/test-login.html /usr/share/nginx/html/test-login.html FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/openeuler/nginx:1.22.0-22.03-lts -COPY --from=Builder /home/openeuler-certificate/web/dist/ /usr/share/nginx/html/ +COPY --from=Builder /home/signatrust/app/dist/ /usr/share/nginx/html/ RUN chmod -R 755 /usr/share/nginx/html COPY ./deploy/nginx/nginx.conf /etc/nginx/nginx.conf - ENV RUN_USER nginx ENV RUN_GROUP nginx EXPOSE 8080 diff --git a/app/deploy/nginx/nginx.conf b/app/deploy/nginx/nginx.conf index f503926..63e249a 100644 --- a/app/deploy/nginx/nginx.conf +++ b/app/deploy/nginx/nginx.conf @@ -70,11 +70,8 @@ http { gzip_vary on; server { - # listen 443 ssl; - # server_name localhost; - # charset utf-8; - - listen 80; + listen 8080 default_server; + listen [::]:8080 default_server; charset utf-8; limit_conn perserver 50; @@ -94,16 +91,6 @@ http { location /oneid/ { proxy_pass https://omapi.osinfra.cn/; } - - location /api/ { - proxy_pass https://signatrust.test.osinfra.cn/; - } - - - # root /usr/share/nginx/html; - # index index.html index.htm; - # try_files $uri $uri/ /index.html; - # error_page 404 /404.html; } } } diff --git a/app/package.json b/app/package.json index 26b58e0..cefa6d5 100644 --- a/app/package.json +++ b/app/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vue-tsc && vite build", + "build": "vite build", "preview": "vite preview" }, "dependencies": { diff --git a/app/src/before.ts b/app/src/before.ts deleted file mode 100644 index fd7956d..0000000 --- a/app/src/before.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { getCodeByUrl } from '@/shared/utils/login'; - - -// getCodeByUrl(); diff --git a/app/src/main.ts b/app/src/main.ts index c29765b..d42b642 100644 --- a/app/src/main.ts +++ b/app/src/main.ts @@ -6,7 +6,6 @@ import OpenDesign from 'opendesign'; import { router } from './router'; import ElementPlus from 'element-plus' import 'element-plus/theme-chalk/index.css' -import './before.ts'; import { createPinia } from 'pinia'; const app = createApp(App) app.use(router) diff --git a/app/src/pages/listShow/CreatePgp.vue b/app/src/pages/listShow/CreatePgp.vue index 591ccef..a8b270e 100644 --- a/app/src/pages/listShow/CreatePgp.vue +++ b/app/src/pages/listShow/CreatePgp.vue @@ -391,7 +391,4 @@ const getChange = () => { margin-left: 2px; } } -// element.style { -// width: auto; -// } diff --git a/app/src/router.ts b/app/src/router.ts index ebb99dd..3a9e6a1 100644 --- a/app/src/router.ts +++ b/app/src/router.ts @@ -11,12 +11,6 @@ export const routes: RouteRecordRaw[] = [ return import('@/pages/apiTokens/ApiTokens.vue'); }, }, - // { - // path: '/login', - // component: () => { - // return import('@/pages/AppLogin.vue'); - // }, - // }, ]; export const router = createRouter({ diff --git a/app/vite.config.ts b/app/vite.config.ts index 84d3209..2aa8178 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -7,10 +7,9 @@ import vueJsx from '@vitejs/plugin-vue-jsx'; // https://vitejs.dev/config/ export default defineConfig({ - // envDir: './viteEnv', base: '/', build: { - outDir: path.resolve(__dirname, '../../dist/euler'), + outDir: path.resolve(__dirname, './dist'), }, resolve: { alias: { -- Gitee From 7cb14cbd1fbf6cd1f7db0242c6d37a875bf5c0b7 Mon Sep 17 00:00:00 2001 From: TommyLike Date: Wed, 24 May 2023 17:28:34 +0800 Subject: [PATCH 2/2] Update readme document --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8f56ad4..8ad5936 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ This project consists of several binaries: 2. **control-server**: the control server used for handle administration requests and expose http requests for Web UI. 3. **control-admin**: the control-admin is mainly used in develop environment for convenience, i.e. generate administrator and tokens without the integration of external OIDC server. 4. **client**: the client is responsible for handle signing task locally and will exchange signature with data server. +5. **app**: the app used for administrator to manage keys and tokens. # Documents on sign/verify specific files 1. [RPM/SRPM file](./docs/how%20to%20sign%20rpm&srpm%20file.md) -- Gitee