Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
global-jenkinsfile
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
QA
global-jenkinsfile
Commits
0d474a52
Commit
0d474a52
authored
Jan 17, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
docker build -f
parent
ea063029
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
StageBucketTke.groovy
src/org/qg/docker_new/StageBucketTke.groovy
+4
-4
qgDockerPiplineWithDockerSlaveTke.groovy
vars/qgDockerPiplineWithDockerSlaveTke.groovy
+1
-1
No files found.
src/org/qg/docker_new/StageBucketTke.groovy
View file @
0d474a52
...
...
@@ -565,9 +565,9 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
args
+=
"--build-arg SAFE_SYSTEM_NAME=${systemName} "
args
+=
"--build-arg BUILD_SCHEMA=${build_schema} "
args
+=
"--build-arg FROM_IMAGE=${imageTagCode} "
def
image
=
docker
.
build
(
imageTag
)
def
image
=
docker
.
build
(
imageTag
Code
,
"-f DockerfileCode ${contextDir}"
)
image
.
push
()
def
image
=
docker
.
build
(
imageTag
,
"${args} ${contextDir}"
)
def
image
=
docker
.
build
(
imageTag
,
"${args}
-f Dockerfile
${contextDir}"
)
image
.
push
()
if
(
branchName
==
"master"
||
branchName
==
"master--master"
)
{
...
...
@@ -597,10 +597,10 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
}
def
clean_images
(
imageTag
,
contextDir
)
{
def
clean_images
(
imageTag
,
imageTagCode
,
contextDir
)
{
sh
"rm -rf ${contextDir}"
if
(
imageTag
){
sh
"docker rmi -f \$(docker images -q ${imageTag})"
sh
"docker rmi -f \$(docker images -q ${imageTagCode})"
}
}
vars/qgDockerPiplineWithDockerSlaveTke.groovy
View file @
0d474a52
...
...
@@ -95,7 +95,7 @@ def call(body) {
/* 4 */
stage
(
'Clean'
){
_utils
.
beautyEcho
(
"Clear Cache Tmp"
,
"stage"
)
_stage
.
clean_images
(
imageTagInfos
[
0
][
"imageTag"
],
contextDir
)
_stage
.
clean_images
(
imageTagInfos
[
0
][
"imageTag"
],
imageTagInfos
[
0
][
"imageTagCode"
],
contextDir
)
}
}
catch
(
err
)
{
...
...
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