Merge pull request #254 from tonistiigi/fix-create-time

exported: fix image creation time on export
docker-18.09
Akihiro Suda 2018-01-06 15:05:24 +09:00 committed by GitHub
commit 8cd775d108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions

View File

@ -476,6 +476,8 @@ func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) {
require.NotEqual(t, "", ociimg.Config.WorkingDir)
require.Equal(t, "layers", ociimg.RootFS.Type)
require.Equal(t, 2, len(ociimg.RootFS.DiffIDs))
require.NotNil(t, ociimg.Created)
require.True(t, time.Since(*ociimg.Created) < 2*time.Minute)
require.Condition(t, func() bool {
for _, env := range ociimg.Config.Env {
if strings.HasPrefix(env, "PATH=") {

View File

@ -179,6 +179,13 @@ func patchImageConfig(dt []byte, dps []blobs.DiffPair, history []ocispec.History
}
m["history"] = dt
now := time.Now()
dt, err = json.Marshal(&now)
if err != nil {
return nil, errors.Wrap(err, "failed to marshal creation time")
}
m["created"] = dt
dt, err = json.Marshal(m)
return dt, errors.Wrap(err, "failed to marshal config after patch")
}