From 7ef8ddd09252df7e248e193bd6ed6b6d49cc9ede Mon Sep 17 00:00:00 2001 From: Mike Aizatsky Date: Wed, 27 Jul 2016 16:04:01 -0700 Subject: [PATCH] [infra] docker images nits --- freetype2/Jenkinsfile | 5 +++-- infra/base-images/base-clang/Dockerfile | 5 +++-- infra/base-images/base/Dockerfile | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/freetype2/Jenkinsfile b/freetype2/Jenkinsfile index 0f84f1a1c..e26395c59 100644 --- a/freetype2/Jenkinsfile +++ b/freetype2/Jenkinsfile @@ -14,8 +14,9 @@ // //////////////////////////////////////////////////////////////////////////////// -def libfuzzerBuild = fileLoader.fromGit('infra/libfuzzer-pipeline.groovy', - 'https://github.com/google/oss-fuzz.git', 'master', null, '') +def libfuzzerBuild = fileLoader.fromGit( + 'infra/libfuzzer-pipeline.groovy', + 'https://github.com/google/oss-fuzz.git', 'master', null, '') libfuzzerBuild { git = "git://git.sv.nongnu.org/freetype/freetype2.git" diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile index c6ab8507f..8f2ad1b96 100644 --- a/infra/base-images/base-clang/Dockerfile +++ b/infra/base-images/base-clang/Dockerfile @@ -19,7 +19,8 @@ FROM ossfuzz/base MAINTAINER mike.aizatsky@gmail.com -RUN apt-get install -y build-essential make cmake ninja-build git python2.7 +ENV LLVM_DEP_PACKAGES "build-essential make cmake ninja-build git python2.7" +RUN apt-get install -y $LLVM_DEP_PACKAGES RUN mkdir /src /work @@ -45,7 +46,7 @@ RUN rm -rf /src/llvm # RUN ln -s /work/llvm/bin/lld /work/llvm/bin/ld -RUN apt-get remove --purge -y cmake ninja-build python2.7 build-essential +RUN apt-get remove --purge -y $LLVM_DEP_PACKAGES RUN apt-get autoremove -y ENV PATH="/work/llvm/bin:$PATH" diff --git a/infra/base-images/base/Dockerfile b/infra/base-images/base/Dockerfile index 422f12d9e..4ad9af5a4 100644 --- a/infra/base-images/base/Dockerfile +++ b/infra/base-images/base/Dockerfile @@ -19,4 +19,6 @@ FROM ubuntu:16.04 MAINTAINER mike.aizatsky@gmail.com ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get upgrade -y +RUN apt-get update +RUN apt-get upgrade -y +RUN apt-get autoremove -y