diff --git a/cronjob/Dockerfile b/cronjob/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..69877992a1962c39a3c98bd1897b2e6dd3a985d8 --- /dev/null +++ b/cronjob/Dockerfile @@ -0,0 +1,30 @@ +# +# Copyright (C) 2018 XueTong Tech Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM ubuntu:16.04 +MAINTAINER xt + +COPY sources.list /etc/apt/sources.list +RUN apt-get update \ + && apt-get install haveged -y \ + && apt-get -y install language-pack-zh-hans language-pack-zh-hans-base \ + && apt-get -y install curl \ + && rm -rf /var/lib/apt/lists/* + +ENV TZ Asia/Shanghai +ENV LANG zh_CN.UTF-8 +ENV LANGUAGE zh_CN:zh +ENV LC_ALL zh_CN.UTF-8 diff --git a/cronjob/sources.list b/cronjob/sources.list new file mode 100644 index 0000000000000000000000000000000000000000..16d92367763d2fda2c6cd9328a56a25b898397ae --- /dev/null +++ b/cronjob/sources.list @@ -0,0 +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 + diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 0599c2b6f977d10e55141a51767dc06a47ce7dbd..48d5a809a72a08ce3914940b696ec04339afd207 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -68,7 +68,7 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.150} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.155} # jenkins.war checksum, download will be validated using it ARG JENKINS_SHA=90e827e570d013551157e78249b50806f5c3953f9845b634f5c0fc542bf54b9a @@ -80,7 +80,7 @@ ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-w # see https://github.com/docker/docker/issues/8331 # RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \ # && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c - -COPY jenkins-war-2.150.war /usr/share/jenkins/jenkins.war +COPY jenkins-war-2.155.war /usr/share/jenkins/jenkins.war ENV JENKINS_UC https://updates.jenkins.io ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental diff --git a/jenkins/jenkins-war-2.150.war b/jenkins/jenkins-war-2.155.war similarity index 93% rename from jenkins/jenkins-war-2.150.war rename to jenkins/jenkins-war-2.155.war index a8693872e48a15028bb4227c46adcba29fa7ed87..3e2ba2ee6b891d8bf8fa7591a2761c735ad95d07 100644 Binary files a/jenkins/jenkins-war-2.150.war and b/jenkins/jenkins-war-2.155.war differ