diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index b2cb441..081f7e9 100755 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,9 +1,5 @@ # Jenkins -FROM openjdk:8-jdk-stretch - -# 国内加速 -RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak -COPY stretch.sources.list /etc/apt/sources.list +FROM registry.cn-hangzhou.aliyuncs.com/kennylee/java:openjdk-8-jdk RUN apt-get update \ && apt-get install -y git curl unzip vim wget ant \ diff --git a/jenkins/stretch.sources.list b/jenkins/stretch.sources.list deleted file mode 100644 index 20f9a2b..0000000 --- a/jenkins/stretch.sources.list +++ /dev/null @@ -1,8 +0,0 @@ -deb http://mirrors.aliyun.com/debian/ stretch main non-free contrib -deb-src http://mirrors.aliyun.com/debian/ stretch main non-free contrib -deb http://mirrors.aliyun.com/debian-security stretch/updates main -deb-src http://mirrors.aliyun.com/debian-security stretch/updates main -deb http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib -deb-src http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib -deb http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib -deb-src http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 6b5b330..90da084 100755 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -16,10 +16,11 @@ RUN sed -i 's/# zh_CN.UTF-8 UTF-8/zh_CN.UTF-8 UTF-8/g' /etc/locale.gen RUN locale && locale-gen "zh_CN.UTF-8" # Set environment variables. -ENV LANG=zh_CN.UTF-8\ - LANGUAGE=zh_CN:zh:en_US:en\ - LC_ALL=zh_CN.UTF-8\ - TZ=Asia/Shanghai\ +ENV LANG=zh_CN.UTF-8 \ + LANGUAGE=zh_CN:zh:en_US:en \ + LC_ALL=zh_CN.UTF-8 \ + TZ=Asia/Shanghai \ + DEBIAN_FRONTEND="noninteractive" \ TERM=xterm RUN ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \