Skip to content

Commit

Permalink
fix: locale time override (#133)
Browse files Browse the repository at this point in the history 
Fixes #110

The locale rule has a time argument that wasn't being used in the
locale.sh script.

Fix plus test exercising it.
  • Loading branch information
@jjmaestro
jjmaestro authored Dec 12, 2024
1 parent 13b18ba commit 81c2dfd
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 23 deletions.
4 changes: 3 additions & 1 deletion distroless/private/locale.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ shift 4

tmp=$(mktemp -d)
"$bsdtar" -xf "$package_path" $@ -C "$tmp"
"$bsdtar" -cf - $@ --format=mtree --options '!gname,!uname,!sha1,!nlink,!time' "@$package_path" | sed 's/$/ time=0.0/' | "$bsdtar" --gzip --options 'gzip:!timestamp' -cf "$out" -C "$tmp/" @-
"$bsdtar" -cf - $@ --format=mtree --options '!gname,!uname,!sha1,!nlink,!time' "@$package_path" |
sed 's/$/ time='"$time"'/' |
"$bsdtar" --gzip --options 'gzip:!timestamp' -cf "$out" -C "$tmp/" @-
47 changes: 25 additions & 22 deletions examples/locale/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
load("//distroless:defs.bzl", "locale")
load("//distroless/tests:asserts.bzl", "assert_tar_mtree")

EPOCH = 123

locale(
name = "bullseye",
charset = "C.UTF-8",
Expand Down Expand Up @@ -39,33 +41,34 @@ assert_tar_mtree(
locale(
name = "bookworm",
package = "@example-bookworm-libc-bin//:data.tar.xz",
time = str(EPOCH),
)

assert_tar_mtree(
name = "test_bookworm",
actual = "bookworm",
expected = """\
#mtree
./usr time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/lib time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale/C.utf8 time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale/C.utf8/LC_ADDRESS time=0.0 mode=644 gid=0 uid=0 type=file size=127
./usr/lib/locale/C.utf8/LC_COLLATE time=0.0 mode=644 gid=0 uid=0 type=file size=1406
./usr/lib/locale/C.utf8/LC_CTYPE time=0.0 mode=644 gid=0 uid=0 type=file size=353616
./usr/lib/locale/C.utf8/LC_IDENTIFICATION time=0.0 mode=644 gid=0 uid=0 type=file size=258
./usr/lib/locale/C.utf8/LC_MEASUREMENT time=0.0 mode=644 gid=0 uid=0 type=file size=23
./usr/lib/locale/C.utf8/LC_MONETARY time=0.0 mode=644 gid=0 uid=0 type=file size=270
./usr/lib/locale/C.utf8/LC_NAME time=0.0 mode=644 gid=0 uid=0 type=file size=62
./usr/lib/locale/C.utf8/LC_NUMERIC time=0.0 mode=644 gid=0 uid=0 type=file size=50
./usr/lib/locale/C.utf8/LC_PAPER time=0.0 mode=644 gid=0 uid=0 type=file size=34
./usr/lib/locale/C.utf8/LC_TELEPHONE time=0.0 mode=644 gid=0 uid=0 type=file size=47
./usr/lib/locale/C.utf8/LC_TIME time=0.0 mode=644 gid=0 uid=0 type=file size=3360
./usr/lib/locale/C.utf8/LC_MESSAGES time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES time=0.0 mode=644 gid=0 uid=0 type=file size=48
./usr/share time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/share/doc time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/share/doc/libc-bin time=0.0 mode=755 gid=0 uid=0 type=dir
./usr/share/doc/libc-bin/copyright time=0.0 mode=644 gid=0 uid=0 type=file size=25467
""",
./usr time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/lib time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale/C.utf8 time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale/C.utf8/LC_ADDRESS time={time}.0 mode=644 gid=0 uid=0 type=file size=127
./usr/lib/locale/C.utf8/LC_COLLATE time={time}.0 mode=644 gid=0 uid=0 type=file size=1406
./usr/lib/locale/C.utf8/LC_CTYPE time={time}.0 mode=644 gid=0 uid=0 type=file size=353616
./usr/lib/locale/C.utf8/LC_IDENTIFICATION time={time}.0 mode=644 gid=0 uid=0 type=file size=258
./usr/lib/locale/C.utf8/LC_MEASUREMENT time={time}.0 mode=644 gid=0 uid=0 type=file size=23
./usr/lib/locale/C.utf8/LC_MONETARY time={time}.0 mode=644 gid=0 uid=0 type=file size=270
./usr/lib/locale/C.utf8/LC_NAME time={time}.0 mode=644 gid=0 uid=0 type=file size=62
./usr/lib/locale/C.utf8/LC_NUMERIC time={time}.0 mode=644 gid=0 uid=0 type=file size=50
./usr/lib/locale/C.utf8/LC_PAPER time={time}.0 mode=644 gid=0 uid=0 type=file size=34
./usr/lib/locale/C.utf8/LC_TELEPHONE time={time}.0 mode=644 gid=0 uid=0 type=file size=47
./usr/lib/locale/C.utf8/LC_TIME time={time}.0 mode=644 gid=0 uid=0 type=file size=3360
./usr/lib/locale/C.utf8/LC_MESSAGES time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES time={time}.0 mode=644 gid=0 uid=0 type=file size=48
./usr/share time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/share/doc time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/share/doc/libc-bin time={time}.0 mode=755 gid=0 uid=0 type=dir
./usr/share/doc/libc-bin/copyright time={time}.0 mode=644 gid=0 uid=0 type=file size=25467
""".format(time = EPOCH),
)

0 comments on commit 81c2dfd

Please sign in to comment.