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
58f57f8a
Commit
58f57f8a
authored
Nov 12, 2015
by
Dr. Stefan Schimanski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move MESOS_DOCKER_SKIP_BUILD default to config-default.sh
parent
3d2ae0e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
config-default.sh
cluster/mesos/docker/config-default.sh
+3
-0
util.sh
cluster/mesos/docker/util.sh
+1
-1
No files found.
cluster/mesos/docker/config-default.sh
View file @
58f57f8a
...
@@ -66,3 +66,6 @@ DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS:---log-level=error}"
...
@@ -66,3 +66,6 @@ DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS:---log-level=error}"
# Force a dump of the logs into ${MESOS_DOCKER_WORK_DIR}/log on kube-down.sh. By
# Force a dump of the logs into ${MESOS_DOCKER_WORK_DIR}/log on kube-down.sh. By
# default this only happens when kube-up.sh fails.
# default this only happens when kube-up.sh fails.
MESOS_DOCKER_DUMP_LOGS
=
"
${
MESOS_DOCKER_DUMP_LOGS
:-
false
}
"
MESOS_DOCKER_DUMP_LOGS
=
"
${
MESOS_DOCKER_DUMP_LOGS
:-
false
}
"
# Skip rebuilding the involved docker containers on kube-up.sh.
MESOS_DOCKER_SKIP_BUILD
=
"
${
MESOS_DOCKER_SKIP_BUILD
:-
false
}
"
cluster/mesos/docker/util.sh
View file @
58f57f8a
...
@@ -267,7 +267,7 @@ function kube-up {
...
@@ -267,7 +267,7 @@ function kube-up {
echo
"Pulling Docker images"
1>&2
echo
"Pulling Docker images"
1>&2
cluster::mesos::docker::docker_compose_lazy_pull
cluster::mesos::docker::docker_compose_lazy_pull
if
[
"
${
MESOS_DOCKER_SKIP_BUILD
:-
false
}
"
!=
"true"
]
;
then
if
[
"
${
MESOS_DOCKER_SKIP_BUILD
}
"
!=
"true"
]
;
then
echo
"Building Docker images"
1>&2
echo
"Building Docker images"
1>&2
# TODO: version images (k8s version, git sha, and dirty state) to avoid re-building them every time.
# TODO: version images (k8s version, git sha, and dirty state) to avoid re-building them every time.
"
${
provider_root
}
/km/build.sh"
"
${
provider_root
}
/km/build.sh"
...
...
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