Merge pull request #3482 from rhatdan/timestamp

Add epoch time field to buildah images
containers · Aug 26, 2021 · a20b5f4 · a20b5f4
2 parents 9855bc7 + 71e1ebf
commit a20b5f4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/cmd/buildah/images.go b/cmd/buildah/images.go
@@ -25,6 +25,7 @@ type jsonImage struct {
 	Digest       string    `json:"digest"`
 	CreatedAt    string    `json:"createdat"`
 	Size         string    `json:"size"`
+	Created      int64     `json:"created"`
 	CreatedAtRaw time.Time `json:"createdatraw"`
 	ReadOnly     bool      `json:"readonly"`
 	History      []string  `json:"history"`
@@ -35,6 +36,7 @@ type imageOutputParams struct {
 	ID           string
 	Name         string
 	Digest       string
+	Created      int64
 	CreatedAt    string
 	Size         string
 	CreatedAtRaw time.Time
@@ -204,6 +206,7 @@ func formatImagesJSON(images []*libimage.Image, opts imageOptions) error {
 		jsonImages = append(jsonImages,
 			jsonImage{
 				CreatedAtRaw: created,
+				Created:      created.Unix(),
 				CreatedAt:    units.HumanDuration(time.Since(created)) + " ago",
 				Digest:       image.Digest().String(),
 				ID:           truncateID(image.ID(), opts.truncate),
@@ -246,6 +249,7 @@ func formatImages(images []*libimage.Image, opts imageOptions) error {
 		}
 		created := image.Created()
 		outputParam.CreatedAtRaw = created
+		outputParam.Created = created.Unix()
 		outputParam.CreatedAt = units.HumanDuration(time.Since(created)) + " ago"
 		outputParam.Digest = image.Digest().String()
 		outputParam.ID = truncateID(image.ID(), opts.truncate)

diff --git a/docs/buildah-images.md b/docs/buildah-images.md
@@ -58,14 +58,15 @@ Valid placeholders for the Go template are listed below:
 
 | **Placeholder** | **Description**                          |
 | --------------- | -----------------------------------------|
-| .Tag            | Image Tag                                |
-| .ID             | Image ID                                 |
-| .Name           | Image Name                               |
-| .Digest         | Image Digest                             |
+| .Created        | Creation date in epoch time              |
 | .CreatedAt      | Creation date Pretty Formatted           |
-| .Size           | Image Size                               |
 | .CreatedAtRaw   | Creation date in raw format              |
+| .Digest         | Image Digest                             |
+| .ID             | Image ID                                 |
+| .Name           | Image Name                               |
 | .ReadOnly       | Indicates if image came from a R/O store |
+| .Size           | Image Size                               |
+| .Tag            | Image Tag                                |
 
 **--history**
 

diff --git a/tests/bud.bats b/tests/bud.bats
@@ -2453,20 +2453,24 @@ EOM
 
 @test "bud timestamp" {
   _prefetch alpine
-  run_buildah build --timestamp=0 --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json -t timestamp -f Dockerfile.1 ${TESTSDIR}/bud/cache-stages
+  timestamp=40
+  run_buildah build --timestamp=${timestamp} --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json -t timestamp -f Dockerfile.1 ${TESTSDIR}/bud/cache-stages
   cid=$output
   run_buildah inspect --format '{{ .Docker.Created }}' timestamp
   expect_output --substring "1970-01-01"
   run_buildah inspect --format '{{ .OCIv1.Created }}' timestamp
   expect_output --substring "1970-01-01"
   run_buildah inspect --format '{{ .History }}' timestamp
-  expect_output --substring '1970-01-01 00:00:00'
+  expect_output --substring "1970-01-01 00:00:${timestamp}"
 
   run_buildah from --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json timestamp
   cid=$output
   run_buildah run $cid ls -l /tmpfile
   expect_output --substring "1970"
 
+  run_buildah images --format "{{.Created}}" timestamp
+  expect_output ${timestamp}
+
   rm -rf ${TESTDIR}/tmp
 }
 
@@ -2476,6 +2480,9 @@ EOM
   run_buildah build --timestamp=${TIMESTAMP} --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json -t timestamp -f Dockerfile.1 ${TESTSDIR}/bud/cache-stages
   cid=$output
 
+  run_buildah images --format "{{.Created}}" timestamp
+  expect_output ${timestamp}
+
   run_buildah build --timestamp=${TIMESTAMP} --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json -t timestamp -f Dockerfile.1 ${TESTSDIR}/bud/cache-stages
   expect_output "$cid"