github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13736 from socaa/dockerfile-memory

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-14 16:35:52 -07:00
parent 1f97fbeae6 44e1d55029
commit db128ac0f7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/resource-consumer/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM scratch FROM jess/stress
MAINTAINER Ewa Socala <socaa@google.com> MAINTAINER Ewa Socala <socaa@google.com>
ADD consumer /consumer ADD consumer /consumer
ADD consume-cpu /consume-cpu ADD consume-cpu /consume-cpu