github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

[mesos/docker] Expose DOCKER_DAEMON_ARGS

Browse Source
This commit is contained in:
Karl Isenberg 2015-08-18 16:50:13 -07:00
parent 9b5d525e3d
commit 053cb26dde
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,3 +65,5 @@ MESOS_DOCKER_WORK_DIR="${MESOS_DOCKER_WORK_DIR:-${HOME}/tmp/kubernetes}"
# Must not be either an AUFS mount or an SMB/CIFS mount. # Must not be either an AUFS mount or an SMB/CIFS mount.
# If using docker-machine or boot2docker, should NOT be under /Users (which is mounted from the host into the docker vm). # If using docker-machine or boot2docker, should NOT be under /Users (which is mounted from the host into the docker vm).
MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR:-/var/tmp/kubernetes}" MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR:-/var/tmp/kubernetes}"
DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS:---log-level=error}"

6
cluster/mesos/docker/docker-compose.yml
View File

@ -42,14 +42,13 @@ mesosslave1:
- MESOS_CONTAINERIZERS=docker,mesos - MESOS_CONTAINERIZERS=docker,mesos
- MESOS_WORK_DIR=/var/tmp/mesos - MESOS_WORK_DIR=/var/tmp/mesos
- DOCKER_NETWORK_OFFSET=0.0.1.0 - DOCKER_NETWORK_OFFSET=0.0.1.0
- DOCKER_DAEMON_ARGS=--log-level=error - DOCKER_DAEMON_ARGS
links: links:
- etcd - etcd
- mesosmaster1 - mesosmaster1
- "ambassador:apiserver" - "ambassador:apiserver"
volumes: volumes:
- ${MESOS_DOCKER_WORK_DIR}/mesosslave1/mesos:/var/tmp/mesos - ${MESOS_DOCKER_WORK_DIR}/mesosslave1/mesos:/var/tmp/mesos
- ${MESOS_DOCKER_IMAGE_DIR}/mesosslave1/docker:/var/lib/docker
mesosslave2: mesosslave2:
hostname: mesosslave2 hostname: mesosslave2
privileged: true privileged: true
@ -66,14 +65,13 @@ mesosslave2:
- MESOS_CONTAINERIZERS=docker,mesos - MESOS_CONTAINERIZERS=docker,mesos
- MESOS_WORK_DIR=/var/tmp/mesos - MESOS_WORK_DIR=/var/tmp/mesos
- DOCKER_NETWORK_OFFSET=0.0.2.0 - DOCKER_NETWORK_OFFSET=0.0.2.0
- DOCKER_DAEMON_ARGS=--log-level=error - DOCKER_DAEMON_ARGS
links: links:
- etcd - etcd
- mesosmaster1 - mesosmaster1
- "ambassador:apiserver" - "ambassador:apiserver"
volumes: volumes:
- ${MESOS_DOCKER_WORK_DIR}/mesosslave2/mesos:/var/tmp/mesos - ${MESOS_DOCKER_WORK_DIR}/mesosslave2/mesos:/var/tmp/mesos
- ${MESOS_DOCKER_IMAGE_DIR}/mesosslave2/docker:/var/lib/docker
apiserver: apiserver:
hostname: apiserver hostname: apiserver
image: mesosphere/kubernetes-mesos image: mesosphere/kubernetes-mesos

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

@ -257,6 +257,7 @@ function kube-up {
export KUBE_KEYGEN_TIMEOUT="${KUBE_KEYGEN_TIMEOUT}" export KUBE_KEYGEN_TIMEOUT="${KUBE_KEYGEN_TIMEOUT}"
export MESOS_DOCKER_WORK_DIR="${MESOS_DOCKER_WORK_DIR}" export MESOS_DOCKER_WORK_DIR="${MESOS_DOCKER_WORK_DIR}"
export MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR}" export MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR}"
export DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS}"
docker-compose -f "${compose_file}" up -d docker-compose -f "${compose_file}" up -d
# await-health-check requires GNU timeout # await-health-check requires GNU timeout