github
/
ConsulManager
mirror of https://github.com/starsliao/ConsulManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

更新基础镜像,修复bug

pull/122/head
starsliao 2024-02-23 16:36:39 +08:00
parent f36de9999e
commit 05be7144d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flask-consul/views/jms.py
View File

@ -53,7 +53,7 @@ class Jms(Resource):
count_on = count_on + 1 count_on = count_on + 1
cpu = int(i['cpu'].replace('核','')) cpu = int(i['cpu'].replace('核',''))
count_cpu = count_cpu + cpu count_cpu = count_cpu + cpu
mem = int(i['mem'].replace('GB','')) mem = float(i['mem'].replace('GB',''))
count_mem = count_mem + mem count_mem = count_mem + mem
jms_job = consul_kv.get_value(f"ConsulManager/jms/jobs/{vendor}/{account}") jms_job = consul_kv.get_value(f"ConsulManager/jms/jobs/{vendor}/{account}")

4
vue-consul/Dockerfile
View File

@ -1,9 +1,9 @@
FROM node:14-alpine AS builder FROM node:14-alpine AS builder
ADD . /vue ADD . /vue
WORKDIR /vue WORKDIR /vue
RUN npm install --registry=https://registry.npm.taobao.org && npm run build:prod RUN npm install --registry=https://registry.npmmirror.com && npm run build:prod
FROM nginx:stable-alpine FROM nginx:1.24.0-alpine
WORKDIR /www WORKDIR /www
COPY --from=builder /vue/http-ops.conf /etc/nginx/conf.d/default.conf COPY --from=builder /vue/http-ops.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /vue/dist dist/ COPY --from=builder /vue/dist dist/