From 5500e6e7484a0135d14e176c9b870d8936be40a7 Mon Sep 17 00:00:00 2001 From: ruowen Date: Wed, 11 Sep 2019 07:47:59 +0800 Subject: [PATCH] add make and upgrade jdk Change-Id: Ib2ce0ccc02dcf6a22628480814621a70a5f9ad26 --- jenkins/Dockerfile | 4 ++-- jenkins/sources.list | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 1671b28..12abd1c 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -14,14 +14,14 @@ # limitations under the License. # -FROM registry-vpc.cn-hangzhou.aliyuncs.com/schbrain/jdk:8u172 +FROM registry-vpc.cn-hangzhou.aliyuncs.com/schbrain/jdk:8u172-1.0 MAINTAINER xt COPY sources.list /etc/apt/sources.list RUN apt-get update \ && apt-get install -y git curl \ - && apt-get install sudo -y --allow-unauthenticated \ + && apt-get install sudo make -y --allow-unauthenticated \ && apt-get -y install apt-transport-https ca-certificates software-properties-common \ && curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | apt-key add - \ && add-apt-repository "deb [arch=amd64] http://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable" \ diff --git a/jenkins/sources.list b/jenkins/sources.list index 16d9236..82bd962 100644 --- a/jenkins/sources.list +++ b/jenkins/sources.list @@ -1,19 +1,19 @@ -# deb cdrom:[Ubuntu 16.04 LTS _Xenial Xerus_ - Release amd64 (20160420.1)]/ xenial main restricted -deb-src http://archive.ubuntu.com/ubuntu xenial main restricted #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial universe -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe -deb http://mirrors.aliyun.com/ubuntu/ xenial multiverse -deb http://mirrors.aliyun.com/ubuntu/ xenial-updates multiverse -deb http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse #Added by software-properties -deb http://archive.canonical.com/ubuntu xenial partner -deb-src http://archive.canonical.com/ubuntu xenial partner -deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted -deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted multiverse universe #Added by software-properties -deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe -deb http://mirrors.aliyun.com/ubuntu/ xenial-security multiverse +# deb cdrom:[Ubuntu 16.04 LTS _Xenial Xerus_ - Release amd64 (20160420.1)]/ bionic main restricted +deb-src http://archive.ubuntu.com/ubuntu bionic main restricted #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic universe +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates universe +deb http://mirrors.aliyun.com/ubuntu/ bionic multiverse +deb http://mirrors.aliyun.com/ubuntu/ bionic-updates multiverse +deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse #Added by software-properties +deb http://archive.canonical.com/ubuntu bionic partner +deb-src http://archive.canonical.com/ubuntu bionic partner +deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted +deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted multiverse universe #Added by software-properties +deb http://mirrors.aliyun.com/ubuntu/ bionic-security universe +deb http://mirrors.aliyun.com/ubuntu/ bionic-security multiverse -- GitLab