Skip to content

Commit c87855d

Browse files
authored
Fix compatibility with external modules. (#198)
If this modules is used with external modules located in subfolders, it generates wrong pathes, like: `bazel-out/x64_windows-fastbuild/bin/../distroless_base+/os_release.content`, but correct path must be: `bazel-out/x64_windows-fastbuild/bin/external/distroless_base+/os_release.content` The patch must fix the issue.
1 parent 0aaedd0 commit c87855d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

distroless/private/group.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def group(name, entries, time = "0.0", mode = "0644", **kwargs):
4646
"file",
4747
mode = mode,
4848
time = time,
49-
content = "$(BINDIR)/$(rootpath :%s_content)" % name,
49+
content = "$(execpath :%s_content)" % name,
5050
)
5151

5252
tar(

distroless/private/os_release.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def os_release(
4747
"file",
4848
mode = mode,
4949
time = time,
50-
content = "$(BINDIR)/$(rootpath :%s_content)" % name,
50+
content = "$(execpath :%s_content)" % name,
5151
)
5252

5353
tar(

distroless/private/passwd.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def passwd(name, entries, mode = "0644", time = "0.0", **kwargs):
5656
"file",
5757
mode = mode,
5858
time = time,
59-
content = "$(BINDIR)/$(rootpath :%s_content)" % name,
59+
content = "$(execpath :%s_content)" % name,
6060
)
6161

6262
tar(

0 commit comments

Comments
 (0)