Skip to content

C
cicdhtj
Commit 54d027f3 by xujian
Options

加锁

parent 515e82b5
Showing with 135 additions and 63 deletions
Docker/nginx/Dockerfile 0 → 100644
FROM nginx:latest
ARG FILE_NAME="default"
COPY ${FILE_NAME} /usr/share/nginx/html/
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
RUN rm /etc/nginx/conf.d/default.conf
COPY default.conf /etc/nginx/conf.d/
\ No newline at end of file
Docker/nginx/default.conf 0 → 100644
server {
listen 80;
server_name localhost;
location / {
root /usr/share/nginx/html/;
try_files $uri $uri/ /index.html;
index index.html index.htm;
}
location /prod-api/{
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://172.17.0.9:8080/;
}
# 子系统访问厂级
location /sub-api/{
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8080/;
}
# 调控到边侧
location /dev-api/{
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8080/;
client_max_body_size 20m;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
Jenkinsfile
...@@ -8,7 +8,7 @@ def repos = [ ...@@ -8,7 +8,7 @@ def repos = [
] ]
def modules = [ def modules = [
] ]
def web = [ def webs = [
] ]
def push_path = "192.168.31.201/develop" def push_path = "192.168.31.201/develop"
...@@ -36,15 +36,15 @@ pipeline { ...@@ -36,15 +36,15 @@ pipeline {
def yamlFile = readFile('project.yaml') def yamlFile = readFile('project.yaml')
def smallfile = log.readYaml(yamlFile) def smallfile = log.readYaml(yamlFile)
repos.add([dir: smallfile.base.name, type: smallfile.base.type, isUpdate: smallfile.base.isUpdate, url: smallfile.base.url]) repos.add([dir: smallfile.base.dir, type: smallfile.base.type, isUpdate: smallfile.base.isUpdate, url: smallfile.base.url])
repos.add([dir: smallfile.core.name, type: smallfile.core.type, isUpdate: smallfile.core.isUpdate, url: smallfile.core.url]) repos.add([dir: smallfile.core.dir, type: smallfile.core.type, isUpdate: smallfile.core.isUpdate, url: smallfile.core.url])
repos.add([dir: smallfile.htj.name, type: smallfile.htj.type, isUpdate: smallfile.htj.isUpdate, url: smallfile.htj.url]) repos.add([dir: smallfile.htj.dir, type: smallfile.htj.type, isUpdate: smallfile.htj.isUpdate, url: smallfile.htj.url])
repos.add([dir: smallfile.web.name, type: smallfile.web.type, isUpdate: smallfile.web.isUpdate, url: smallfile.web.url]) repos.add([dir: smallfile.web.dir, type: smallfile.web.type, isUpdate: smallfile.web.isUpdate, url: smallfile.web.url])
if(smallfile.base.module) { if(smallfile.base.module) {
for (module in smallfile.base.module) { for (module in smallfile.base.module) {
modules.add([ modules.add([
dir: smallfile.base.name, dir: smallfile.base.dir,
name: module.name, name: module.name,
version: module.version, version: module.version,
isUpdate: module.isUpdate, isUpdate: module.isUpdate,
...@@ -57,7 +57,7 @@ pipeline { ...@@ -57,7 +57,7 @@ pipeline {
if(smallfile.core.module) { if(smallfile.core.module) {
for (module in smallfile.core.module) { for (module in smallfile.core.module) {
modules.add([ modules.add([
dir: smallfile.core.name, dir: smallfile.core.dir,
name: module.name, name: module.name,
version: module.version, version: module.version,
isUpdate: module.isUpdate, isUpdate: module.isUpdate,
...@@ -70,25 +70,21 @@ pipeline { ...@@ -70,25 +70,21 @@ pipeline {
if(smallfile.htj.module) { if(smallfile.htj.module) {
for (module in smallfile.htj.module) { for (module in smallfile.htj.module) {
modules.add([ modules.add([
dir: smallfile.htj.name, dir: smallfile.htj.dir,
name: module.name, name: module.name,
version: module.version, version: module.version,
isUpdate: module.isUpdate, isUpdate: module.isUpdate,
isEncryption: module.isEncryption, isEncryption: module.isEncryption,
path: module.path path: module.path
]) ])
} }
} }
if(smallfile.web.module) { if(smallfile.web) {
web.add([ web.add([
dir: smallfile.web.name, dir: smallfile.web.dir,
name: module.name, name: smallfile.web.name,
version: moudle.version, version: smallfile.web.version,
isUpdate: moudle.isUpdate, isUpdate: smallfile.web.isUpdate
isEncryption: moudle.isEncryption,
path: moudle.path
]) ])
} }
...@@ -107,7 +103,7 @@ pipeline { ...@@ -107,7 +103,7 @@ pipeline {
} }
} }
stage('步骤三: 项目构建'){ stage('步骤三: 后端构建'){
steps { steps {
script { script {
for (repo in repos) { for (repo in repos) {
...@@ -151,6 +147,19 @@ pipeline { ...@@ -151,6 +147,19 @@ pipeline {
} }
} }
} }
stage('步骤五: 前端构建'){
steps {
script {
for (web in webs) {
sh "docker build -f Docker/nginx/Dockerfile -t ${push_path}/${web.name}:${web.version} --build-arg FILE_NAME=${web.dir}/dist/ ${workspace}"
sh "echo Qrcode@2022 | docker login https://192.168.31.201 --username admin --password-stdin"
sh "docker push ${push_path}/${web.name}:${web.version}"
sh "docker images -f 'dangling=true' -q | xargs -r docker rmi"
}
}
}
}
stage('步骤五: 服务部署'){ stage('步骤五: 服务部署'){
steps { steps {
......
project.yaml
...@@ -6,73 +6,81 @@ version: v24.09.20 ...@@ -6,73 +6,81 @@ version: v24.09.20
# 如果项目base.isUpdate: false / core.isUpdate: false / htj.isUpdate: false 构建整个项目 # 如果项目base.isUpdate: false / core.isUpdate: false / htj.isUpdate: false 构建整个项目
# 如果模块为true指定项目打包 # 如果模块为true指定项目打包
base: base:
name: "BASE" dir: "BASE"
type: "mvn" type: "mvn"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-basic.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-basic.git"
namespace: qrcode-xxx namespace: qrcode-xxx
isUpdate: false isUpdate: false
module: module:
- name: factory-tobacco-qrcode-auth - name: factory-tobacco-qrcode-auth
path: factory-tobacco-qrcode-auth
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-auth
- name: factory-tobacco-qrcode-gateway - name: factory-tobacco-qrcode-gateway
path: factory-tobacco-qrcode-gateway
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-gateway
- name: factory-tobacco-qrcode-modules-file - name: factory-tobacco-qrcode-modules-file
path: factory-tobacco-qrcode-modules-file
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-file
- name: factory-tobacco-qrcode-modules-gen - name: factory-tobacco-qrcode-modules-gen
path: factory-tobacco-qrcode-modules-gen
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-gen
core: core:
name: "CORE" dir: "CORE"
type: "mvn" type: "mvn"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcodecore.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcodecore.git"
namespace: qrcode-xxx namespace: qrcode-xxx
isUpdate: false isUpdate: false
module: module:
- name: factory-tobacco-qrcode-modules-data-migrate - name: factory-tobacco-qrcode-modules-data-migrate
path: factory-tobacco-qrcode-modules-data-migrate
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-data-migrate
- name: factory-tobacco-qrcode-modules-device - name: factory-tobacco-qrcode-modules-device
path: factory-tobacco-qrcode-modules-device
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-device
- name: factory-tobacco-qrcode-modules-monitor-alarm - name: factory-tobacco-qrcode-modules-monitor-alarm
path: factory-tobacco-qrcode-modules-monitor-alarm
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-monitor-alarm
- name: factory-tobacco-qrcode-modules-stmb-register - name: factory-tobacco-qrcode-modules-stmb-register
path: factory-tobacco-qrcode-modules-stmb-register
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-stmb-register
- name: factory-tobacco-qrcode-modules-system - name: factory-tobacco-qrcode-modules-system
path: factory-tobacco-qrcode-modules-system
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-system
- name: factory-tobacco-qrcode-modules-timesync - name: factory-tobacco-qrcode-modules-timesync
path: factory-tobacco-qrcode-modules-timesync
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-timesync
htj: htj:
name: "HTJ" dir: "HTJ"
type: "mvn" type: "mvn"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj.git"
namespace: qrcode-xxx namespace: qrcode-xxx
...@@ -84,63 +92,64 @@ htj: ...@@ -84,63 +92,64 @@ htj:
# isEncryption: false # isEncryption: false
# path: factory-tobacco-qrcode-module-monitoring-platform # path: factory-tobacco-qrcode-module-monitoring-platform
- name: factory-tobacco-qrcode-module-product-syncmes - name: factory-tobacco-qrcode-module-product-syncmes
path: factory-tobacco-qrcode-module-product-syncmes
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-module-product-syncmes
- name: factory-tobacco-qrcode-modules-db-version-control - name: factory-tobacco-qrcode-modules-db-version-control
path: factory-tobacco-qrcode-modules-db-version-control
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-db-version-control
- name: factory-tobacco-qrcode-modules-iotege-relation - name: factory-tobacco-qrcode-modules-iotege-relation
path: factory-tobacco-qrcode-modules-iotege-relation
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-iotege-relation
- name: factory-tobacco-qrcode-modules-product-bloomfilter - name: factory-tobacco-qrcode-modules-product-bloomfilter
path: factory-tobacco-qrcode-modules-product-bloomfilter
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-product-bloomfilter
- name: factory-tobacco-qrcode-modules-product-relation - name: factory-tobacco-qrcode-modules-product-relation
path: factory-tobacco-qrcode-modules-product-relation
isEncryption: false
version: v24.09.25 version: v24.09.25
isUpdate: true isUpdate: true
isEncryption: false
path: factory-tobacco-qrcode-modules-product-relation
- name: factory-tobacco-qrcode-modules-product-report - name: factory-tobacco-qrcode-modules-product-report
path: factory-tobacco-qrcode-modules-product-report
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-product-report
- name: factory-tobacco-qrcode-modules-product-statistics - name: factory-tobacco-qrcode-modules-product-statistics
path: factory-tobacco-qrcode-modules-product-statistics
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-product-statistics
- name: factory-tobacco-qrcode-modules-product-upload - name: factory-tobacco-qrcode-modules-product-upload
path: factory-tobacco-qrcode-modules-product-upload
isEncryption: true
version: v24.09.25 version: v24.09.25
isUpdate: true isUpdate: true
isEncryption: true
path: factory-tobacco-qrcode-modules-product-upload
- name: factory-tobacco-qrcode-modules-wip-relation - name: factory-tobacco-qrcode-modules-wip-relation
path: factory-tobacco-qrcode-modules-wip-relation
isEncryption: false
version: v24.09.20 version: v24.09.20
isUpdate: false isUpdate: false
isEncryption: false
path: factory-tobacco-qrcode-modules-wip-relation
web: web:
name: "WEB" dir: "WEB"
name: "qrcode-web"
type: "node" type: "node"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
isUpdate: false # isEncryption: false
version: v24.09.20 version: v24.09.20
isEncryption: false isUpdate: false
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment