[infra] docker images nits

This commit is contained in:
Mike Aizatsky 2016-07-27 16:04:01 -07:00
parent df7eb1f258
commit 7ef8ddd092
3 changed files with 9 additions and 5 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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