public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated vendor for new version of container-diff

This commit is contained in:
Priya Wadhwa 2018-03-07 15:35:44 -08:00
parent cefb4448b1
commit cd9467dcf4
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gopkg.lock generated
View File

@ -15,7 +15,7 @@
"pkg/image", "pkg/image",
"pkg/util" "pkg/util"
] ]
revision = "ce3228b4afba2b2fb9b42c416c8f59a14ee7c1dd" revision = "6a521891eafa833a08adf664edb6e67b18220ea7"
source = "github.com/GoogleCloudPlatform/container-diff" source = "github.com/GoogleCloudPlatform/container-diff"
[[projects]] [[projects]]
@ -119,7 +119,7 @@
"pkg/system", "pkg/system",
"pkg/truncindex" "pkg/truncindex"
] ]
revision = "66a38bb219e9776482c18e8c02f438e5112916f1" revision = "1e5ce40cdb84ab66e26186435b1273e04b879fef"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -370,7 +370,7 @@
"nfs", "nfs",
"xfs" "xfs"
] ]
revision = "d274e363d5759d1c916232217be421f1cc89c5fe" revision = "1c7ff3de94ae006f58cba483a4c9c6d7c61e1d98"
[[projects]] [[projects]]
name = "github.com/sirupsen/logrus" name = "github.com/sirupsen/logrus"
@ -419,7 +419,7 @@
"openpgp/s2k", "openpgp/s2k",
"ssh/terminal" "ssh/terminal"
] ]
revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab" revision = "85f98707c97e11569271e4d9b3d397e079c4f4d0"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -433,7 +433,7 @@
"lex/httplex", "lex/httplex",
"proxy" "proxy"
] ]
revision = "22ae77b79946ea320088417e4d50825671d82d57" revision = "07e8617a6db2368fa55d4616f371ee1b1403c817"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -442,7 +442,7 @@
"unix", "unix",
"windows" "windows"
] ]
revision = "f6cff0780e542efa0c8e864dc8fa522808f6a598" revision = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9"
[[projects]] [[projects]]
name = "golang.org/x/text" name = "golang.org/x/text"

8
vendor/github.com/GoogleCloudPlatform/container-diff/pkg/image/mutable_source.go generated vendored
View File

@ -142,7 +142,7 @@ func (m *MutableSource) AppendLayer(content []byte, author string) error {
// Also add it to the config. // Also add it to the config.
diffID := digest.FromBytes(content) diffID := digest.FromBytes(content)
m.cfg.RootFS.DiffIDs = append(m.cfg.RootFS.DiffIDs, diffID) m.cfg.RootFS.DiffIDs = append(m.cfg.RootFS.DiffIDs, diffID)
m.appendConfigHistory(author, false) m.AppendConfigHistory(author, false)
return nil return nil
} }
@ -184,7 +184,7 @@ func (m *MutableSource) SetEnv(envMap map[string]string, author string) {
envArray = append(envArray, entry) envArray = append(envArray, entry)
} }
m.cfg.Schema2V1Image.Config.Env = envArray m.cfg.Schema2V1Image.Config.Env = envArray
m.appendConfigHistory(author, true) m.AppendConfigHistory(author, true)
} }
func (m *MutableSource) Config() *manifest.Schema2Config { func (m *MutableSource) Config() *manifest.Schema2Config {
@ -193,10 +193,10 @@ func (m *MutableSource) Config() *manifest.Schema2Config {
func (m *MutableSource) SetConfig(config *manifest.Schema2Config, author string, emptyLayer bool) { func (m *MutableSource) SetConfig(config *manifest.Schema2Config, author string, emptyLayer bool) {
m.cfg.Schema2V1Image.Config = config m.cfg.Schema2V1Image.Config = config
m.appendConfigHistory(author, emptyLayer) m.AppendConfigHistory(author, emptyLayer)
} }
func (m *MutableSource) appendConfigHistory(author string, emptyLayer bool) { func (m *MutableSource) AppendConfigHistory(author string, emptyLayer bool) {
history := manifest.Schema2History{ history := manifest.Schema2History{
Created: time.Now(), Created: time.Now(),
Author: author, Author: author,

5
vendor/github.com/containers/storage/store.go generated vendored
View File

@ -2276,14 +2276,15 @@ func (s *store) Shutdown(force bool) ([]string, error) {
return mounted, err return mounted, err
} }
s.graphLock.Lock()
defer s.graphLock.Unlock()
rlstore.Lock() rlstore.Lock()
defer rlstore.Unlock() defer rlstore.Unlock()
if modified, err := rlstore.Modified(); modified || err != nil { if modified, err := rlstore.Modified(); modified || err != nil {
rlstore.Load() rlstore.Load()
} }
s.graphLock.Lock()
defer s.graphLock.Unlock()
layers, err := rlstore.Layers() layers, err := rlstore.Layers()
if err != nil { if err != nil {
return mounted, err return mounted, err

7
vendor/golang.org/x/sys/unix/syscall_linux_arm64.go generated vendored
View File

@ -23,8 +23,11 @@ package unix
//sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK //sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) { func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
ts := Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} var ts *Timespec
return Pselect(nfd, r, w, e, &ts, nil) if timeout != nil {
ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
}
return Pselect(nfd, r, w, e, ts, nil)
} }
//sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)

7
vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go generated vendored
View File

@ -26,8 +26,11 @@ package unix
//sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK //sys Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) { func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
ts := Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} var ts *Timespec
return Pselect(nfd, r, w, e, &ts, nil) if timeout != nil {
ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
}
return Pselect(nfd, r, w, e, ts, nil)
} }
//sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)