From 0e3334664b6d838d92dd15798cf2c3526b8962ec Mon Sep 17 00:00:00 2001 From: "StarsL.cn" Date: Mon, 20 Jun 2022 00:47:31 +0800 Subject: [PATCH] TenSunS --- Makefile | 3 +++ vue-consul/Dockerfile.tensuns | 11 +++++++++++ vue-consul/src/settings.js.tensuns | 16 ++++++++++++++++ vue-consul/src/views/login/index.vue.tensuns | 2 +- 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 vue-consul/Dockerfile.tensuns create mode 100644 vue-consul/src/settings.js.tensuns diff --git a/Makefile b/Makefile index 01240d6..4c2ae21 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ help: build: cd flask-consul && docker build -t flask-consul:latest . cd vue-consul && docker build -t nginx-consul:latest . + cd vue-consul && docker build -t nginx-consul:tensuns-latest -f Dockerfile.tensuns . echo -e "\n\n自行编译的版本,注意修改docker-compose.yml中的镜像地址为本地仓库后再启动。\nBlackbox-Manager:\nhttp://{ip}:1026\n" push: @@ -15,6 +16,8 @@ push: docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:${ver} docker push registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:latest docker push registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:${ver} + docker tag nginx-consul:tensuns-latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:tensuns-latest + docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:tensuns-latest update: docker-compose pull && docker-compose up -d diff --git a/vue-consul/Dockerfile.tensuns b/vue-consul/Dockerfile.tensuns new file mode 100644 index 0000000..8b0a7c3 --- /dev/null +++ b/vue-consul/Dockerfile.tensuns @@ -0,0 +1,11 @@ +FROM node:14-alpine AS builder +ADD . /vue +WORKDIR /vue +RUN mv -f src/views/login/index.vue.tensuns src/views/login/index.vue && \ + mv -f src/settings.js.tensuns src/settings.js && \ + npm install --registry=https://registry.npm.taobao.org && npm run build:prod + +FROM nginx:stable-alpine +WORKDIR /www +COPY --from=builder /vue/http-ops.conf /etc/nginx/conf.d/ +COPY --from=builder /vue/dist dist/ diff --git a/vue-consul/src/settings.js.tensuns b/vue-consul/src/settings.js.tensuns new file mode 100644 index 0000000..33f1840 --- /dev/null +++ b/vue-consul/src/settings.js.tensuns @@ -0,0 +1,16 @@ +module.exports = { + + title: '后羿 - TenSunS', + + /** + * @type {boolean} true | false + * @description Whether fix the header + */ + fixedHeader: false, + + /** + * @type {boolean} true | false + * @description Whether show the logo in sidebar + */ + sidebarLogo: false +} diff --git a/vue-consul/src/views/login/index.vue.tensuns b/vue-consul/src/views/login/index.vue.tensuns index 764e6e8..4290f9a 100644 --- a/vue-consul/src/views/login/index.vue.tensuns +++ b/vue-consul/src/views/login/index.vue.tensuns @@ -43,7 +43,7 @@
- v0.6.2 + v0.6.3