C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update CI to use 2.9.0 release and update Dockerfile to now use 18.04 (#4472)

Browse source 
* Update CI to use 2.9.0 release and update Dockerfile to now use 18.04

* Update CI to use 2.9.0 release and update Dockerfile to now use 18.04

* Update the kubectl bin
This commit is contained in:
Andreas Krüger 2019-04-09 14:57:06 +02:00 committed by Kubernetes Prow Robot
parent 097806dfe8
commit a678d1be9d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -42,7 +42,7 @@ before_script:
tags: tags:
- kubernetes - kubernetes
- docker - docker
image: quay.io/kubespray/kubespray:v2.8 image: quay.io/kubespray/kubespray:v2.9.0
.docker_service: &docker_service .docker_service: &docker_service
services: services:

5
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:18.04
RUN mkdir /kubespray RUN mkdir /kubespray
WORKDIR /kubespray WORKDIR /kubespray
@ -14,6 +14,5 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - &&
&& apt update -y && apt-get install docker-ce -y && apt update -y && apt-get install docker-ce -y
COPY . . COPY . .
RUN /usr/bin/python -m pip install pip -U && /usr/bin/python -m pip install -r tests/requirements.txt && python -m pip install -r requirements.txt RUN /usr/bin/python -m pip install pip -U && /usr/bin/python -m pip install -r tests/requirements.txt && python -m pip install -r requirements.txt
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/linux/amd64/kubectl \ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/kubectl \
&& chmod a+x kubectl && cp kubectl /usr/local/bin/kubectl && chmod a+x kubectl && cp kubectl /usr/local/bin/kubectl