diff options
author | Guo Ruijing <ruijing.guo@intel.com> | 2017-11-20 11:19:17 -0500 |
---|---|---|
committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-11-20 11:31:50 -0500 |
commit | b2da960212571fc3e287eedcdc4c8c92fed9bf83 (patch) | |
tree | 2459005c56174500f0556855675e6c7dd2ed35d6 /ci/bento.k8s.diff | |
parent | 39730e33e9e020930990e4f9d23128df25a2c94c (diff) |
update opnfv/containter box
1. add flannel, calico, busybox, nginx and ubuntu in box,
2. use whole file instead of patch
3. deploy new box
Change-Id: I937e0df264ff7b639b4d6e8b7199f9502e502340
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'ci/bento.k8s.diff')
-rw-r--r-- | ci/bento.k8s.diff | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/ci/bento.k8s.diff b/ci/bento.k8s.diff deleted file mode 100644 index 6fac10f..0000000 --- a/ci/bento.k8s.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/ubuntu/scripts/update.sh b/ubuntu/scripts/update.sh -index 9e872b6..02b9058 100644 ---- a/ubuntu/scripts/update.sh -+++ b/ubuntu/scripts/update.sh -@@ -25,3 +25,28 @@ EOF - - # Upgrade all installed packages incl. kernel and kernel headers - apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; -+ -+apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D -+apt-key adv -k 58118E89F3A912897C070ADBF76221572C52609D -+cat << EOF | tee /etc/apt/sources.list.d/docker.list -+deb [arch=amd64] https://apt.dockerproject.org/repo ubuntu-xenial main -+EOF -+ -+curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - -+cat <<EOF | tee /etc/apt/sources.list.d/kubernetes.list -+deb http://apt.kubernetes.io/ kubernetes-xenial main -+EOF -+apt-get update -+apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00 -+ -+docker pull gcr.io/google_containers/kube-proxy-amd64:v1.7.10 -+docker pull gcr.io/google_containers/kube-apiserver-amd64:v1.7.10 -+docker pull gcr.io/google_containers/kube-controller-manager-amd64:v1.7.10 -+docker pull gcr.io/google_containers/kube-scheduler-amd64:v1.7.10 -+docker pull weaveworks/weave-npc:2.0.5 -+docker pull weaveworks/weave-kube:2.0.5 -+docker pull gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4 -+docker pull gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4 -+docker pull gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4 -+docker pull gcr.io/google_containers/etcd-amd64:3.0.17 -+docker pull gcr.io/google_containers/pause-amd64:3.0 |