epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update k8s to 1.14.2

Browse Source
This commit is contained in:
Marcos Lilljedahl
2019-05-22 20:02:50 -03:00
parent b758b005e9
commit a35c99b9fe
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dockerfiles/k8s/Dockerfile
View File

@@ -5,8 +5,8 @@ COPY ./kubernetes.repo /etc/yum.repos.d/
RUN yum install -y kubectl-1.11.3-0 kubeadm-1.11.3-0 kubelet-1.11.3-0 \
&& mv -f /etc/systemd/system/kubelet.service.d/10-kubeadm.conf /etc/systemd/system/kubelet.service \
RUN yum install -y kubectl-1.14.2 kubeadm-1.14.2 kubelet-1.14.2 \
#&& mv -f /etc/systemd/system/kubelet.service.d/10-kubeadm.conf /etc/systemd/system/kubelet.service \
&& yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
&& yum install -y docker-ce git \
&& sed -i -e '4d;5d;8d' /lib/systemd/system/docker.service \
@@ -24,6 +24,7 @@ COPY ./wrapkubeadm.sh /usr/local/bin/kubeadm
COPY ./tokens.csv /etc/pki/tokens.csv
COPY ./daemon.json /etc/docker/
COPY ./resolv.conf.override /etc/
COPY ./docker.service /usr/lib/systemd/system/
COPY motd /etc/motd