Skip to content

zero out times #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loosebazooka merged 2 commits into from
Dec 4, 2025
Merged

zero out times #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395a244
zero out times
loosebazooka Dec 4, 2025
af7dcba
temp remove --semantic flag
loosebazooka Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions common/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load("@aspect_bazel_lib//lib:tar.bzl", "tar")
load("@rules_distroless//distroless:defs.bzl", "cacerts", "group", "home", "locale", "os_release", "passwd")
load("//:distro.bzl", "ALL_ARCHITECTURES", "ALL_DISTROS", "VERSIONS")
load("//private/util:deb.bzl", "deb")
load(":variables.bzl", "MTIME", "NOBODY", "NONROOT", "OS_RELEASE", "ROOT", "quote")
load(":variables.bzl", "NOBODY", "NONROOT", "OS_RELEASE", "ROOT", "quote")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -30,7 +30,7 @@ tar(
"gnutar",
],
compress = "gzip",
mtree = ["./tmp gname=root uname=root time=1501783453.0 mode=1777 gid=0 uid=0 type=dir"],
mtree = ["./tmp gname=root uname=root time=0.0 mode=1777 gid=0 uid=0 type=dir"],
)

[
Expand All @@ -43,7 +43,6 @@ tar(
))
for (key, value) in OS_RELEASE.items()
},
time = MTIME,
)
for (dist, codename, version) in VERSIONS
]
Expand All @@ -53,7 +52,6 @@ tar(
name = "locale_%s_%s" % (distro, arch),
charset = "C.utf8",
package = deb.data(arch, distro, "libc-bin"),
time = MTIME,
)
for arch in COMMON_ARCHITECTURES
for distro in COMMON_DISTROS
Expand All @@ -63,7 +61,6 @@ tar(
cacerts(
name = "cacerts_%s_%s" % (distro, arch),
package = deb.data(arch, distro, "ca-certificates"),
time = MTIME,
)
for arch in COMMON_ARCHITECTURES
for distro in COMMON_DISTROS
Expand Down Expand Up @@ -99,7 +96,6 @@ group(
"password": "x",
},
],
time = MTIME,
)

passwd(
Expand Down
3 changes: 0 additions & 3 deletions common/variables.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ NOBODY = 65534
NONROOT = 65532
ROOT = 0

# TODO: this should be 0, but for now we'll use this to minimize diff.
MTIME = "946684800"

DEBUG_MODE = ["", "_debug"]
USERS = ["root", "nonroot"]
2 changes: 1 addition & 1 deletion private/tools/diff.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ function test_image() {

bazel build "$image_label"
crane push "$(bazel cquery --output=files $image_label)" "$repo_stage"
if ! diffoci diff --pull=always --all-platforms --semantic "$repo_origin" "$repo_stage"; then
if ! diffoci diff --pull=always --all-platforms "$repo_origin" "$repo_stage"; then
echo ""
echo " 🔬 To reproduce: bazel run //private/tools:diff -- --only $image_label"
echo ""
Expand Down
2 changes: 0 additions & 2 deletions private/util/java_cacerts.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"java ca certificates"

load("@rules_distroless//distroless:defs.bzl", "java_keystore")
load("//common:variables.bzl", "MTIME")
load(":extract.bzl", "tar_extract_file")

def java_cacerts(name, archive):
Expand All @@ -16,5 +15,4 @@ def java_cacerts(name, archive):
certificates = [
":" + name + "_extract",
],
time = MTIME,
)
Loading