Issue/1868

CHANGELOG.md

@@ -9,6 +9,9 @@ For older changes see the [archived Singularity change log](https://github.com/a
 
 ## Changes for v1.3.x
 
+- Fixed the time discrepancy issue between the host and container, which occurs
+  when host's timezone is different from container's.
+
 ## v1.3.0 - \[2024-03-12\]
 
 Changes since v1.2.5

e2e/actions/actions.go

@@ -3063,5 +3063,6 @@ func E2ETests(env e2e.TestEnv) testhelper.Tests {
 		"invalidRemote":                np(c.invalidRemote),     // GHSA-5mv9-q7fq-9394
 		"fakeroot home":                c.actionFakerootHome,    // test home dir in fakeroot
 		"relWorkdirScratch":            np(c.relWorkdirScratch), // test relative --workdir with --scratch
+		"issue 1868":                   c.issue1868,             // https://github.com/apptainer/apptainer/issues/1868
 	}
 }

e2e/actions/regressions.go

@@ -788,3 +788,17 @@ func (c actionTests) issue1848(t *testing.T) {
 		),
 	)
 }
+
+// Verify whether the time discrepancy issue gets resolved
+// see: https://github.com/apptainer/apptainer/issues/1868
+func (c actionTests) issue1868(t *testing.T) {
+	c.env.RunApptainer(
+		t,
+		e2e.WithProfile(e2e.UserProfile),
+		e2e.WithCommand("exec"),
+		e2e.WithArgs("docker://centos:7", "bash", "-c", "TZ=UTC date --date 2020-01-01T12:00:00 +%s"),
+		e2e.ExpectExit(0,
+			e2e.ExpectOutput(e2e.ExactMatch, "1577880000"),
+		),
+	)
+}

internal/pkg/runtime/engine/apptainer/container_linux.go

@@ -1786,6 +1786,16 @@ func (c *container) addBindsMount(system *mount.System) error {
 			}
 		}
 		if !skipAllBinds && !slice.ContainsString(skipBinds, localtimePath) {
+			if c.engine.EngineConfig.GetSessionLayer() == apptainer.OverlayLayer {
+				content, err := os.ReadFile(localtimePath)
+				if err != nil {
+					return fmt.Errorf("while reading host %s, err: %s", localtimePath, err)
+				}
+				if err := c.session.AddFile(filepath.Join(c.session.Layer.Dir(), localtimePath), content); err != nil {
+					return err
+				}
+			}
+
 			if err := system.Points.AddBind(mount.BindsTag, localtimePath, localtimePath, flags, "skip-on-error"); err != nil {
 				return fmt.Errorf("unable to add %s to mount list: %s", localtimePath, err)
 			}
@@ -1817,6 +1827,17 @@ func (c *container) addBindsMount(system *mount.System) error {
 		bindOpt := ""
 		if src == localtimePath || src == hostsPath {
 			bindOpt = "skip-on-error"
+			if c.engine.EngineConfig.GetSessionLayer() == apptainer.OverlayLayer {
+				if src == localtimePath {
+					content, err := os.ReadFile(localtimePath)
+					if err != nil {
+						return fmt.Errorf("while reading host %s, err: %s", localtimePath, err)
+					}
+					if err := c.session.AddFile(filepath.Join(c.session.Layer.Dir(), localtimePath), content); err != nil {
+						return err
+					}
+				}
+			}
 		}
 
 		err := system.Points.AddBind(mount.BindsTag, src, dst, flags, bindOpt)