比较提交

...

11 次代码提交

作者 SHA1 备注 提交日期
DESKTOP-FUDKNA8\znjsz
aee1e06137 fix conflicts 2024-04-28 11:18:12 +08:00
ce02c70014 Merge pull request '1' (#9) from projects/mescc/zjl into projects/mescc/develop
所有检测均成功
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2024-04-20 10:07:08 +08:00
906262f622 1 2024-04-20 10:06:24 +08:00
dbb60ac09b Merge pull request 'yarnlock更新' (#8) from projects/mescc/zjl into projects/mescc/develop
所有检测均成功
continuous-integration/drone/push Build is passing
Reviewed-on: #8
2024-04-20 09:58:28 +08:00
e0e48960ed yarnlock更新 2024-04-20 09:57:58 +08:00
2518fb3533 Merge pull request 'projects/mescc/zjl' (#7) from projects/mescc/zjl into projects/mescc/develop
一些检查失败了
continuous-integration/drone/push Build is failing
Reviewed-on: #7
2024-04-20 08:44:19 +08:00
af3ba890ec 修改地址 2024-04-20 08:43:44 +08:00
e3579186fa merge develop 2024-04-19 17:26:57 +08:00
a9f36c61ec 1 2024-04-19 17:22:45 +08:00
shr
af4b947c22 👷 添加自动构建发布配置
所有检测均成功
continuous-integration/drone/push Build is passing
2024-04-19 17:13:21 +08:00
8012bbec9f Merge pull request '修复CodeBrickZj没引入问题' (#5) from projects/mescc/lb into projects/mescc/develop
Reviewed-on: #5
2024-04-19 09:33:34 +08:00
共有 5 个文件被更改,包括 8149 次插入8489 次删除

查看文件

@ -1,3 +1,3 @@
.dockerignore
dist
#dist
node_modules

58
.drone.yml 普通文件
查看文件

@ -0,0 +1,58 @@
---
kind: pipeline
type: docker
name: default
steps:
- name: build
image: node:16-alpine
pull: if_not_exists
environment:
NODE_ENV: ""
commands:
- yarn install --frozen-lockfile
- env ${NODE_ENV} yarn build:prod
- name: publish
image: docker:dind
pull: if_not_exists
volumes:
- name: dockersock
path: /var/run/docker.sock
- name: dockerconfig
path: /root/.docker
commands:
- docker build -t hub.kszny.picaiba.com/kszny/glass-ui ./
- docker push hub.kszny.picaiba.com/kszny/glass-ui
depends_on:
- build
- name: deploy
image: appleboy/drone-ssh
pull: if-not-exists
settings:
host:
- 172.24.145.74
username: root
password: Root@123
port: 22
command_timeout: 2m
script:
- docker pull hub.kszny.picaiba.com/kszny/glass-ui
- docker run --rm -v /data/www/ksznpt:/tmp hub.kszny.picaiba.com/kszny/glass-ui sh -c "rm -rf /tmp/* && mv -f /html /tmp"
depends_on:
- publish
volumes:
- name: dockersock
host:
path: /var/run/docker.sock
- name: dockerconfig
host:
path: /root/.docker
trigger:
branch:
- projects/mescc/develop
event:
- push

查看文件

@ -2,15 +2,15 @@
NODE_ENV = 'production'
# 页面标题
VUE_APP_TITLE = 芋道管理系统
VUE_APP_TITLE = 玻璃控股信息平台
# 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = ''
# 根据服务器或域名修改
PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
PUBLIC_PATH = ''
# 二级部署路径
VUE_APP_APP_NAME ='yudao-admin'
# VUE_APP_APP_NAME ='yudao-admin'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true

查看文件

@ -1,21 +1,3 @@
FROM node:16-alpine as build-stage
WORKDIR /admim
COPY .npmrc package.json yarn.lock ./
RUN --mount=type=cache,id=yarn-store,target=/root/.yarn-store \
yarn install --frozen-lockfile
COPY . .
ARG NODE_ENV=""
RUN env ${NODE_ENV} yarn build:prod
## -- stage: dist => nginx --
FROM nginx:alpine
ENV TZ=Asia/Shanghai
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=build-stage /admim/dist /usr/share/nginx/html
EXPOSE 80
FROM busybox
LABEL maintainer thomas.hairong@gmail.com
COPY dist /html/

16546
yarn.lock

文件差异内容过多而无法显示 加载差异