Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
4959c2c7
Commit
4959c2c7
authored
Jun 08, 2016
by
Tim Hockin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up logging in build container
parent
ac75bd11
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
common.sh
build/common.sh
+4
-4
No files found.
build/common.sh
View file @
4959c2c7
...
...
@@ -313,11 +313,11 @@ function kube::build::clean_output() {
kube::log::error
"Build image not built. Cannot clean via docker build image."
fi
kube::log::status
"Removing data container"
kube::log::status
"Removing data container
${
KUBE_BUILD_DATA_CONTAINER_NAME
}
"
"
${
DOCKER
[@]
}
"
rm
-v
"
${
KUBE_BUILD_DATA_CONTAINER_NAME
}
"
>
/dev/null 2>&1
||
true
fi
kube::log::status
"
Cleaning out local
_output directory"
kube::log::status
"
Removing
_output directory"
rm
-rf
"
${
LOCAL_OUTPUT_ROOT
}
"
}
...
...
@@ -525,7 +525,7 @@ function kube::build::docker_build() {
local
-r
pull
=
"
${
3
:-
true
}
"
local
-ra
build_cmd
=(
"
${
DOCKER
[@]
}
"
build
-t
"
${
image
}
"
"--pull=
${
pull
}
"
"
${
context_dir
}
"
)
kube::log::status
"Building Docker image
${
image
}
.
"
kube::log::status
"Building Docker image
${
image
}
"
local
docker_output
docker_output
=
$(
"
${
build_cmd
[@]
}
"
2>&1
)
||
{
cat
<<
EOF
>&2
...
...
@@ -560,7 +560,7 @@ function kube::build::clean_images() {
function
kube::build::ensure_data_container
()
{
if
!
"
${
DOCKER
[@]
}
"
inspect
"
${
KUBE_BUILD_DATA_CONTAINER_NAME
}
"
>
/dev/null 2>&1
;
then
kube::log::status
"Creating data container"
kube::log::status
"Creating data container
${
KUBE_BUILD_DATA_CONTAINER_NAME
}
"
local
-ra
docker_cmd
=(
"
${
DOCKER
[@]
}
"
run
"
${
DOCKER_DATA_MOUNT_ARGS
[@]
}
"
...
...
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