mirror of
				https://github.com/containers/podman.git
				synced 2025-11-04 08:56:05 +08:00 
			
		
		
		
	Bump github.com/containers/storage from 1.38.0 to 1.38.1
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.38.0 to 1.38.1. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.38.0...v1.38.1) --- updated-dependencies: - dependency-name: github.com/containers/storage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
		
							
								
								
									
										3
									
								
								vendor/github.com/containers/storage/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/containers/storage/Makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							@ -51,6 +51,9 @@ sources := $(wildcard *.go cmd/containers-storage/*.go drivers/*.go drivers/*/*.
 | 
			
		||||
containers-storage: $(sources) ## build using gc on the host
 | 
			
		||||
	$(GO) build $(MOD_VENDOR) -compiler gc $(BUILDFLAGS) ./cmd/containers-storage
 | 
			
		||||
 | 
			
		||||
codespell:
 | 
			
		||||
	codespell -S Makefile,build,buildah,buildah.spec,imgtype,copy,AUTHORS,bin,vendor,.git,go.sum,CHANGELOG.md,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,*ico,*.png,*.1,*.5,*.orig,*.rej" -L uint,iff,od,ERRO -w
 | 
			
		||||
 | 
			
		||||
binary local-binary: containers-storage
 | 
			
		||||
 | 
			
		||||
local-gccgo: ## build using gccgo on the host
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/github.com/containers/storage/VERSION
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/containers/storage/VERSION
									
									
									
										generated
									
									
										vendored
									
									
								
							@ -1 +1 @@
 | 
			
		||||
1.38.0
 | 
			
		||||
1.38.1
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/containers/storage/pkg/archive/archive.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/containers/storage/pkg/archive/archive.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@ -511,6 +511,10 @@ func (ta *tarAppender) addTarFile(path, name string) error {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if fi.Mode()&os.ModeSocket != 0 {
 | 
			
		||||
		logrus.Warnf("archive: skipping %q since it is a socket", path)
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	hdr, err := FileInfoHeader(name, fi, link)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/github.com/containers/storage/pkg/chunked/compression.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/containers/storage/pkg/chunked/compression.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@ -87,7 +87,7 @@ func readEstargzChunkedManifest(blobStream ImageSourceSeekable, blobSize int64,
 | 
			
		||||
	   - 2  bytes  Extra: SI1 = 'S', SI2 = 'G'
 | 
			
		||||
	   - 2  bytes  Extra: LEN = 22 (16 hex digits + len("STARGZ"))
 | 
			
		||||
	   - 22 bytes  Extra: subfield = fmt.Sprintf("%016xSTARGZ", offsetOfTOC)
 | 
			
		||||
	   - 5  bytes  flate header: BFINAL = 1(last block), BTYPE = 0(non-compressed block), LEN = 0
 | 
			
		||||
	   - 5  bytes  flat header: BFINAL = 1(last block), BTYPE = 0(non-compressed block), LEN = 0
 | 
			
		||||
	   - 8  bytes  gzip footer
 | 
			
		||||
	*/
 | 
			
		||||
	tocOffset, err := strconv.ParseInt(string(footer[16:16+22-6]), 16, 64)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/containers/storage/store.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/containers/storage/store.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@ -647,7 +647,7 @@ func GetStore(options types.StoreOptions) (Store, error) {
 | 
			
		||||
	storesLock.Lock()
 | 
			
		||||
	defer storesLock.Unlock()
 | 
			
		||||
 | 
			
		||||
	// return if BOTH run and graph root are matched, otherwise our run-root can be overriden if the graph is found first
 | 
			
		||||
	// return if BOTH run and graph root are matched, otherwise our run-root can be overridden if the graph is found first
 | 
			
		||||
	for _, s := range stores {
 | 
			
		||||
		if (s.graphRoot == options.GraphRoot) && (s.runRoot == options.RunRoot) && (options.GraphDriverName == "" || s.graphDriverName == options.GraphDriverName) {
 | 
			
		||||
			return s, nil
 | 
			
		||||
@ -1613,7 +1613,7 @@ func (s *store) ImageBigData(id, key string) ([]byte, error) {
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if foundImage {
 | 
			
		||||
		return nil, errors.Wrapf(os.ErrNotExist, "error locating item named %q for image with ID %q", key, id)
 | 
			
		||||
		return nil, errors.Wrapf(os.ErrNotExist, "error locating item named %q for image with ID %q (consider removing the image to resolve the issue)", key, id)
 | 
			
		||||
	}
 | 
			
		||||
	return nil, errors.Wrapf(ErrImageUnknown, "error locating image with ID %q", id)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/containers/storage/types/options.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/containers/storage/types/options.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@ -321,7 +321,7 @@ func ReloadConfigurationFile(configFile string, storeOptions *StoreOptions) {
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Clear storeOptions of previos settings
 | 
			
		||||
	// Clear storeOptions of previous settings
 | 
			
		||||
	*storeOptions = StoreOptions{}
 | 
			
		||||
	if config.Storage.Driver != "" {
 | 
			
		||||
		storeOptions.GraphDriverName = config.Storage.Driver
 | 
			
		||||
@ -443,7 +443,7 @@ func Save(conf TomlConfig, rootless bool) error {
 | 
			
		||||
	return toml.NewEncoder(f).Encode(conf)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// StorageConfig is used to retreive the storage.conf toml in order to overwrite it
 | 
			
		||||
// StorageConfig is used to retrieve the storage.conf toml in order to overwrite it
 | 
			
		||||
func StorageConfig(rootless bool) (*TomlConfig, error) {
 | 
			
		||||
	config := new(TomlConfig)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user