github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move MESOS_DOCKER_SKIP_BUILD default to config-default.sh

pull/6/head
Dr. Stefan Schimanski 2015-11-12 00:28:21 +01:00
parent 3d2ae0e67f
commit 58f57f8a18
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/mesos/docker/config-default.sh
View File

@ -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}"

2
cluster/mesos/docker/util.sh
View File

@ -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"