github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

Use specific version of docker instead of latest.

Browse Source
This commit is contained in:
Brad Moylan 2016-08-17 22:11:58 -07:00
parent 7a4908b278
commit 3cb6589a97
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/centos/build.sh
View File

@ -52,8 +52,8 @@ function download-releases() {
echo "Download kubernetes release v${K8S_VERSION} ..." echo "Download kubernetes release v${K8S_VERSION} ..."
curl -L ${K8S_DOWNLOAD_URL} -o ${RELEASES_DIR}/kubernetes.tar.gz curl -L ${K8S_DOWNLOAD_URL} -o ${RELEASES_DIR}/kubernetes.tar.gz
echo "Download docker-latest ..." echo "Download docker release v${DOCKER_VERSION} ..."
curl -L https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz -o ${RELEASES_DIR}/docker.tar.gz curl -L ${DOCKER_DOWNLOAD_URL} -o ${RELEASES_DIR}/docker.tar.gz
} }
function unpack-releases() { function unpack-releases() {
@ -95,6 +95,7 @@ function unpack-releases() {
cp ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kubectl ${BINARY_DIR} cp ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kubectl ${BINARY_DIR}
fi fi
# docker
if [[ -f ${RELEASES_DIR}/docker.tar.gz ]]; then if [[ -f ${RELEASES_DIR}/docker.tar.gz ]]; then
tar xzf ${RELEASES_DIR}/docker.tar.gz -C ${RELEASES_DIR} tar xzf ${RELEASES_DIR}/docker.tar.gz -C ${RELEASES_DIR}

6
cluster/centos/config-build.sh
View File

@ -19,6 +19,9 @@
# Directory to store release packages that will be downloaded. # Directory to store release packages that will be downloaded.
RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads} RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
# Define docker version to use.
DOCKER_VERSION=${DOCKER_VERSION:-"1.12.0"}
# Define flannel version to use. # Define flannel version to use.
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"} FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
@ -28,6 +31,9 @@ ETCD_VERSION=${ETCD_VERSION:-"3.0.4"}
# Define k8s version to use. # Define k8s version to use.
K8S_VERSION=${K8S_VERSION:-"1.3.5"} K8S_VERSION=${K8S_VERSION:-"1.3.5"}
DOCKER_DOWNLOAD_URL=\
"https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz"
FLANNEL_DOWNLOAD_URL=\ FLANNEL_DOWNLOAD_URL=\
"https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz" "https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz"

2
cluster/centos/node/scripts/docker.sh
View File

@ -35,7 +35,7 @@ Type=notify
EnvironmentFile=-/run/flannel/docker EnvironmentFile=-/run/flannel/docker
EnvironmentFile=-/opt/kubernetes/cfg/docker EnvironmentFile=-/opt/kubernetes/cfg/docker
WorkingDirectory=/opt/kubernetes/bin WorkingDirectory=/opt/kubernetes/bin
ExecStart=/opt/kubernetes/bin/docker daemon \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPTS ExecStart=/opt/kubernetes/bin/dockerd \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPTS
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576