re-order custom apt-packages before pip requirements (b/163169552) (#82)

google · Aug 12, 2020 · 9062a7b · 9062a7b
1 parent 8055bd5
commit 9062a7b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/caliban/docker/build.py b/caliban/docker/build.py
@@ -648,6 +648,12 @@ def _dockerfile_template(
                                      adc_path=adc_path,
                                      credentials_path=credentials_path)
 
+  dockerfile += _custom_packages(uid,
+                                 gid,
+                                 packages=c.apt_packages(
+                                     caliban_config, job_mode),
+                                 shell=shell)
+
   dockerfile += _dependency_entries(workdir,
                                     uid,
                                     gid,
@@ -661,12 +667,6 @@ def _dockerfile_template(
 
   dockerfile += _extra_dir_entries(workdir, uid, gid, extra_dirs)
 
-  dockerfile += _custom_packages(uid,
-                                 gid,
-                                 packages=c.apt_packages(
-                                     caliban_config, job_mode),
-                                 shell=shell)
-
   dockerfile += _resource_entries(uid, gid, resource_files)
 
   if package is not None: