attempt pkg_files+pkg_tar

sourcegraph · Apr 8, 2024 · 2fd50a1 · 2fd50a1
1 parent e22671b
commit 2fd50a1
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/cmd/server/macro.bzl b/cmd/server/macro.bzl
@@ -1,4 +1,5 @@
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", "pkg_mkdirs")
 
 def get_last_segment(path):
     segments = path.split("/")
@@ -14,11 +15,20 @@ def container_dependencies(targets):
     for target in targets:
         name = get_last_segment(target)
 
+        pkg_files(
+            name = "files_{}".format(name),
+            srcs = [target],
+            attributes = pkg_attributes(
+                mode = "0555",
+            ),
+            prefix = "/usr/local/bin",
+        )
+
         pkg_tar(
             name = "tar_{}".format(name),
-            srcs = [target],
-            remap_paths = {"/{}".format(name): "/usr/local/bin/{}".format(name)},
-            modes = {"/usr/local/bin/{}".format(name): "0555"},
+            srcs = [":files_{}".format(name)],
+            # remap_paths = {"/{}".format(name): "/usr/local/bin/{}".format(name)},
+            # modes = {"/usr/local/bin/{}".format(name): "0555"},
         )
 
 def dependencies_tars(targets):