Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
node-devlop-rest-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhouzihao
node-devlop-rest-api
Commits
aceacc36
Commit
aceacc36
authored
Apr 03, 2020
by
zhouzihao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix-修复部署测试环境的bug
parent
2bb71eae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
api/buidApi.js
api/buidApi.js
+3
-3
shell/java.js
shell/java.js
+4
-4
No files found.
api/buidApi.js
View file @
aceacc36
...
@@ -13,11 +13,11 @@ module.exports = {
...
@@ -13,11 +13,11 @@ module.exports = {
var
version
=
body
.
version
;
var
version
=
body
.
version
;
// 接受是否发布的数据 没有传的情况下默认没有发布
// 接受是否发布的数据 没有传的情况下默认没有发布
var
is_deploy
=
_
.
isEmpty
(
body
.
is_deploy
)
?
false
:
body
.
is_deploy
;
var
is_deploy
=
_
.
has
(
body
,
"
is_deploy
"
)
?
body
.
is_deploy
:
false
;
//todo 这里的值是字符串还对象
//todo 这里的值是字符串还对象
var
deploy_list
=
_
.
isEmpty
(
body
.
deploy_list
)
?
[]
:
body
.
deploy_list
;
var
deploy_list
=
_
.
isEmpty
(
body
.
deploy_list
)
?
[]
:
body
.
deploy_list
;
var
result
=
await
buildshell
.
build
(
p_id
,
env_id
,
branch
,
version
,
is_deploy
,
deploy_list
);
var
result
=
await
buildshell
.
build
(
p_id
,
env_id
,
branch
,
version
,
is_deploy
,
deploy_list
);
res
.
end
(
"
{
\"
success
\"
:true}
"
);
res
.
end
(
"
{
\"
success
\"
:true}
"
);
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
log
(
error
);
console
.
log
(
error
);
...
...
shell/java.js
View file @
aceacc36
...
@@ -149,8 +149,8 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
...
@@ -149,8 +149,8 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
}
}
deploy_name
=
envObj
.
name
+
"
-
"
+
module_name
;
deploy_name
=
envObj
.
name
+
"
-
"
+
module_name
;
if
(
_
.
isObject
(
v
)
&&
_
.
has
(
v
,
`de
vlop
.
${
envObj
.
name
}
`
))
{
if
(
_
.
isObject
(
v
)
&&
_
.
has
(
v
,
`de
ploy
.
${
envObj
.
name
}
`
))
{
deploy_name
=
_
.
get
(
v
,
`de
vlop.
${
envObj
,
name
}
`
);
deploy_name
=
_
.
get
(
v
,
`de
ploy.
${
envObj
.
name
}
`
);
}
}
var
pom_object
=
await
pomParserPromise
(
opt
);
var
pom_object
=
await
pomParserPromise
(
opt
);
...
@@ -175,7 +175,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
...
@@ -175,7 +175,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
docker_push_str
+=
"
"
+
'
- docker push ${IMAGE_LATEST_
'
+
service_name
+
'
}
'
+
"
\n
"
;
docker_push_str
+=
"
"
+
'
- docker push ${IMAGE_LATEST_
'
+
service_name
+
'
}
'
+
"
\n
"
;
//部署指令
//部署指令
if
(
is_deploy
)
{
if
(
is_deploy
&&
deploy_list
.
indexOf
(
module_name
)
>
0
)
{
deploy_str
+=
"
"
+
`- docker service update --image
${
envObj
.
registry_url
}
/
${
registry_group
}
/
${
project_name
}
/
${
image_name
}
:
${
version
}
${
deploy_name
}
`
+
"
\n
"
deploy_str
+=
"
"
+
`- docker service update --image
${
envObj
.
registry_url
}
/
${
registry_group
}
/
${
project_name
}
/
${
image_name
}
:
${
version
}
${
deploy_name
}
`
+
"
\n
"
}
}
// 这里要写dockerfile
// 这里要写dockerfile
...
@@ -223,7 +223,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
...
@@ -223,7 +223,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
"
{success_str}
"
:
success_str
,
"
{success_str}
"
:
success_str
,
"
{fail_str}
"
:
fail_str
,
"
{fail_str}
"
:
fail_str
,
"
{deploy_str}
"
:
_
.
trimEnd
(
deploy_str
,
"
\n
"
),
"
{deploy_str}
"
:
_
.
trimEnd
(
deploy_str
,
"
\n
"
),
"
{tag}
"
:
envObj
.
name
,
"
{tag}
"
:
envObj
.
name
,
};
};
await
replaceFileByMap
(
gitlab_ci_map
,
`
${
project_dir
}
/.gitlab-ci.yml`
);
await
replaceFileByMap
(
gitlab_ci_map
,
`
${
project_dir
}
/.gitlab-ci.yml`
);
// 提供gitlab-ci
// 提供gitlab-ci
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment