nlewo/nix2container
1
1
Fork 0
mirror of https://github.com/nlewo/nix2container.git synced 2024-09-11 16:36:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change modification time to be consistent with nix store

Browse Source
This commit is contained in:
Mr Vlados 2024-07-08 14:33:34 +05:00
parent 20aad300c9
commit 6f51fc5c89
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/image_test.go
View File

@ -34,8 +34,8 @@ func TestGetV1Image(t *testing.T) {
image := types.Image{
Layers: []types.Layer{
{
Digest: "sha256:6123adfc04c22915c112368b802af161b921fbf7ef1c5f7283191ee552b46e27",
DiffIDs: "sha256:6123adfc04c22915c112368b802af161b921fbf7ef1c5f7283191ee552b46e27",
Digest: "sha256:adf74a52f9e1bcd7dab77193455fa06743b979cf5955148010e5becedba4f72d",
DiffIDs: "sha256:adf74a52f9e1bcd7dab77193455fa06743b979cf5955148010e5becedba4f72d",
Size: 10,
MediaType: "application/vnd.oci.image.layer.v1.tar",
},
@ -47,7 +47,7 @@ func TestGetV1Image(t *testing.T) {
OS: "linux",
RootFS: v1.RootFS{
DiffIDs: []digest.Digest{
"sha256:6123adfc04c22915c112368b802af161b921fbf7ef1c5f7283191ee552b46e27"},
"sha256:adf74a52f9e1bcd7dab77193455fa06743b979cf5955148010e5becedba4f72d"},
Type: "layers",
},
History: []v1.History{

14
nix/layers_test.go
View File

@ -24,8 +24,8 @@ func TestPerms(t *testing.T) {
}
expected := []types.Layer{
{
Digest: "sha256:6123adfc04c22915c112368b802af161b921fbf7ef1c5f7283191ee552b46e27",
DiffIDs: "sha256:6123adfc04c22915c112368b802af161b921fbf7ef1c5f7283191ee552b46e27",
Digest: "sha256:adf74a52f9e1bcd7dab77193455fa06743b979cf5955148010e5becedba4f72d",
DiffIDs: "sha256:adf74a52f9e1bcd7dab77193455fa06743b979cf5955148010e5becedba4f72d",
Size: 3072,
Paths: types.Paths{
types.Path{
@ -56,8 +56,8 @@ func TestNewLayers(t *testing.T) {
}
expected := []types.Layer{
{
Digest: "sha256:f2c0df36c223df52ef1ccc9d5979b39fb03fecae111f908fc9c2bdd50d477acd",
DiffIDs: "sha256:f2c0df36c223df52ef1ccc9d5979b39fb03fecae111f908fc9c2bdd50d477acd",
Digest: "sha256:cc45bd46eca903b0900ebb997dffd5778904dca9ec02e7375dd1e653dfb61e2e",
DiffIDs: "sha256:cc45bd46eca903b0900ebb997dffd5778904dca9ec02e7375dd1e653dfb61e2e",
Size: 3072,
Paths: types.Paths{
types.Path{
@ -76,8 +76,8 @@ func TestNewLayers(t *testing.T) {
}
expected = []types.Layer{
{
Digest: "sha256:f2c0df36c223df52ef1ccc9d5979b39fb03fecae111f908fc9c2bdd50d477acd",
DiffIDs: "sha256:f2c0df36c223df52ef1ccc9d5979b39fb03fecae111f908fc9c2bdd50d477acd",
Digest: "sha256:cc45bd46eca903b0900ebb997dffd5778904dca9ec02e7375dd1e653dfb61e2e",
DiffIDs: "sha256:cc45bd46eca903b0900ebb997dffd5778904dca9ec02e7375dd1e653dfb61e2e",
Size: 3072,
Paths: types.Paths{
types.Path{
@ -85,7 +85,7 @@ func TestNewLayers(t *testing.T) {
},
},
MediaType: "application/vnd.oci.image.layer.v1.tar",
LayerPath: tmpDir + "/f2c0df36c223df52ef1ccc9d5979b39fb03fecae111f908fc9c2bdd50d477acd.tar",
LayerPath: tmpDir + "/cc45bd46eca903b0900ebb997dffd5778904dca9ec02e7375dd1e653dfb61e2e.tar",
},
}
assert.Equal(t, expected, layer)

5
nix/tar.go
View File

@ -64,6 +64,9 @@ func createDirectory(tw *tar.Writer, path string) error {
ChangeTime: epoch,
Mode: 0755,
}
hdr.ModTime = time.Date(1970, 01, 01, 0, 0, 1, 0, time.UTC)
if err := tw.WriteHeader(hdr); err != nil {
return fmt.Errorf("Could not write hdr '%#v', got error '%s'", hdr, err.Error())
}
@ -123,7 +126,7 @@ func appendFileToTar(tw *tar.Writer, srcPath, dstPath string, info os.FileInfo,
}
}
hdr.ModTime = time.Date(1970, 01, 01, 0, 0, 0, 0, time.UTC)
hdr.ModTime = time.Date(1970, 01, 01, 0, 0, 1, 0, time.UTC)
hdr.AccessTime = time.Date(1970, 01, 01, 0, 0, 0, 0, time.UTC)
hdr.ChangeTime = time.Date(1970, 01, 01, 0, 0, 0, 0, time.UTC)

2
nix/tar_test.go
View File

@ -15,7 +15,7 @@ func TestTar(t *testing.T) {
if err != nil {
t.Fatalf("%v", err)
}
expectedDigest := "sha256:25561a5f9e53bfd69476c622953dee27868291dd67c478b499da6a1962893bb4"
expectedDigest := "sha256:1ea63d00b937dc24c711265b80444cc9e7e63751fb7f349b160be61d31381983"
assert.Equal(t, expectedDigest, digest.String())
expectedSize := int64(4096)