From a678d1be9def9cf31e0c92474a8edb3c5d3fd3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= <ak@patientsky.com>
Date: Tue, 9 Apr 2019 14:57:06 +0200
Subject: [PATCH] Update CI to use 2.9.0 release and update Dockerfile to now
use 18.04 (#4472)
* 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
---
.gitlab-ci.yml | 2 +-
Dockerfile | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11eb67ec0..e4f84e776 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ before_script:
tags:
- kubernetes
- docker
- image: quay.io/kubespray/kubespray:v2.8
+ image: quay.io/kubespray/kubespray:v2.9.0
.docker_service: &docker_service
services:
diff --git a/Dockerfile b/Dockerfile
index 24bcdddf2..e2ee3f4d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
RUN mkdir /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
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 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
-
--
GitLab