Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1095)

Unified Diff: blimp/engine/testing/Dockerfile

Issue 2154873002: Update ADD handling in Dockerfiles and test bundle creation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clarifying new script behavior in comments and argument naming. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: blimp/engine/testing/Dockerfile
diff --git a/blimp/engine/testing/Dockerfile b/blimp/engine/testing/Dockerfile
index 71c87fc8f93373d464d83d126631c2e39d2a78da..567cbf010690b917accf1b7c79037345581ac4a3 100644
--- a/blimp/engine/testing/Dockerfile
+++ b/blimp/engine/testing/Dockerfile
@@ -4,15 +4,15 @@
# Engine itself.
FROM base:latest
-RUN mkdir -p /out/test/
+RUN mkdir -p /blimp/
-# The glob below expands to all files, but does not add directories
-# recursively.
-# Test binaries assume src directory is 2 levels down. While this behavior can
-# be changed with flags, the directory structure is set up to minimize
-# potential problems with initial integration.
-ADD * /out/test/
+RUN useradd -ms /bin/bash blimp_user
-RUN chown -R blimp_user /out/test/
+# Put all the blimp related files in /blimp so they are kept separate from
maniscalco 2016/07/19 21:52:36 nit: blimp -> Blimp for consistency with other com
Jess 2016/07/19 22:32:41 Done.
+# the OS files. Using '.' instead of '*' ensures directory structure is
+# maintained since ADD only copies the contents of directories
maniscalco 2016/07/19 21:52:36 nit: Missing period at end of sentence.
Jess 2016/07/19 22:32:41 Done.
+ADD . /blimp/
+
+RUN chown -R blimp_user /blimp
USER blimp_user

Powered by Google App Engine
This is Rietveld 408576698