Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[infra] docker image name update

This commit is contained in:
Mike Aizatsky 2016-07-21 12:43:53 -07:00
parent 8ea64588a9
commit 99633cda6a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
expat/Dockerfile
View File

@ -14,7 +14,7 @@
# #
################################################################################ ################################################################################
FROM libfuzzer/base-fuzzer FROM ossfuzz/base-libfuzzer
MAINTAINER mike.aizatsky@gmail.com MAINTAINER mike.aizatsky@gmail.com
CMD /workspace/oss-fuzz/expat/build.sh CMD /workspace/oss-fuzz/expat/build.sh

12
infra/base-images/Jenkinsfile vendored
View File

@ -21,9 +21,9 @@ def dockerOptions="--no-cache"
node { node {
stage name: 'Build Docker Images', concurrency: 1 stage name: 'Build Docker Images', concurrency: 1
git url: 'https://github.com/google/oss-fuzz/' git url: 'https://github.com/google/oss-fuzz/'
sh "docker build $dockerOptions --pull -t libfuzzer/base infra/base-images/base" sh "docker build $dockerOptions --pull -t ossfuzz/base infra/base-images/base"
sh "docker build $dockerOptions -t libfuzzer/base-clang infra/base-images/base-clang" sh "docker build $dockerOptions -t ossfuzz/base-clang infra/base-images/base-clang"
sh "docker build $dockerOptions -t libfuzzer/base-libfuzzer infra/base-images/base-libfuzzer" sh "docker build $dockerOptions -t ossfuzz/base-libfuzzer infra/base-images/base-libfuzzer"
stage name: 'Push Docker Images', concurrency: 1 stage name: 'Push Docker Images', concurrency: 1
// login into docker // login into docker
@ -33,7 +33,7 @@ node {
// #! is important here to disable default -x. // #! is important here to disable default -x.
sh "#!/bin/bash -e\ndocker info\ndocker version\ndocker login -u='${username}' -p='${password}' -e='${email}' https://index.docker.io/v1/" sh "#!/bin/bash -e\ndocker info\ndocker version\ndocker login -u='${username}' -p='${password}' -e='${email}' https://index.docker.io/v1/"
sh "docker push libfuzzer/base" sh "docker push ossfuzz/base"
sh "docker push libfuzzer/base-clang" sh "docker push ossfuzz/base-clang"
sh "docker push libfuzzer/base-libfuzzer" sh "docker push ossfuzz/base-libfuzzer"
} }