Merge pull request #1772 from saschagrunert/tzdir

Allow searching `$TZDIR` for timezone data
containers · Dec 20, 2023 · a328c8c · a328c8c
2 parents 405c428 + 11bd9aa
commit a328c8c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/pkg/config/config_local.go b/pkg/config/config_local.go
@@ -67,6 +67,13 @@ func (c *ContainersConfig) validateTZ() error {
 		"/etc/zoneinfo",
 	}
 
+	// Allow using TZDIR per:
+	// https://sourceware.org/git/?p=glibc.git;a=blob;f=time/tzfile.c;h=8a923d0cccc927a106dc3e3c641be310893bab4e;hb=HEAD#l149
+	tzdir := os.Getenv("TZDIR")
+	if tzdir != "" {
+		lookupPaths = append(lookupPaths, tzdir)
+	}
+
 	for _, paths := range lookupPaths {
 		zonePath := filepath.Join(paths, c.TZ)
 		if _, err := os.Stat(zonePath); err == nil {