opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-24 02:27:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

bump github.com/containers/common

Browse Source 
Update github.com/containers/common from 0.43.0 to 0.43.2.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
2021-08-18 12:42:20 -04:00
parent 1411fa5f23
commit fc6a020330
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -12,7 +12,7 @@ require (
github.com/containernetworking/cni v0.8.1 github.com/containernetworking/cni v0.8.1
github.com/containernetworking/plugins v0.9.1 github.com/containernetworking/plugins v0.9.1
github.com/containers/buildah v1.22.3 github.com/containers/buildah v1.22.3
github.com/containers/common v0.43.0 github.com/containers/common v0.43.2
github.com/containers/conmon v2.0.20+incompatible github.com/containers/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.15.2 github.com/containers/image/v5 v5.15.2
github.com/containers/ocicrypt v1.1.2 github.com/containers/ocicrypt v1.1.2

4
go.sum
View File

@ -241,8 +241,8 @@ github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRD
github.com/containers/buildah v1.22.3 h1:RomxwUa24jMcqzXQetpw4wGMfNlNZLhc9qwyoWHblwc= github.com/containers/buildah v1.22.3 h1:RomxwUa24jMcqzXQetpw4wGMfNlNZLhc9qwyoWHblwc=
github.com/containers/buildah v1.22.3/go.mod h1:JVXRyx5Rkp5w5jwvaXe45kuHtyoxpERMjXrR45+3Wfg= github.com/containers/buildah v1.22.3/go.mod h1:JVXRyx5Rkp5w5jwvaXe45kuHtyoxpERMjXrR45+3Wfg=
github.com/containers/common v0.42.1/go.mod h1:AaF3ipZfgezsctDuhzLkq4Vl+LkEy7J74ikh2HSXDsg= github.com/containers/common v0.42.1/go.mod h1:AaF3ipZfgezsctDuhzLkq4Vl+LkEy7J74ikh2HSXDsg=
github.com/containers/common v0.43.0 h1:CeDdfhLyPfsG6TAKJneT/4RWOhHfWF2Yv+Wz6SuMusU= github.com/containers/common v0.43.2 h1:oSP5d5sDrq7OkoqLPVrLpi1LZOAwpTwOZXgPDHfmD0E=
github.com/containers/common v0.43.0/go.mod h1:BAoVyRYlxKZKAYpHcFMdrXlIZyzbJp9NwKTgadTd/Dg= github.com/containers/common v0.43.2/go.mod h1:BAoVyRYlxKZKAYpHcFMdrXlIZyzbJp9NwKTgadTd/Dg=
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/image/v5 v5.14.0/go.mod h1:SxiBKOcKuT+4yTjD0AskjO+UwFvNcVOJ9qlAw1HNSPU= github.com/containers/image/v5 v5.14.0/go.mod h1:SxiBKOcKuT+4yTjD0AskjO+UwFvNcVOJ9qlAw1HNSPU=

12
vendor/github.com/containers/common/libimage/image.go generated vendored
View File

@ -499,9 +499,15 @@ func (i *Image) Untag(name string) error {
return errors.Wrapf(err, "error normalizing name %q", name) return errors.Wrapf(err, "error normalizing name %q", name)
} }
if _, isDigested := ref.(reference.Digested); isDigested { // FIXME: this is breaking Podman CI but must be re-enabled once
return errors.Wrap(errUntagDigest, name) // c/storage supports alterting the digests of an image. Then,
} // Podman will do the right thing.
//
// !!! Also make sure to re-enable the tests !!!
//
// if _, isDigested := ref.(reference.Digested); isDigested {
// return errors.Wrap(errUntagDigest, name)
// }
name = ref.String() name = ref.String()

15
vendor/github.com/containers/common/pkg/config/containers.conf generated vendored
View File

@ -60,23 +60,23 @@ default_capabilities = [
] ]
# A list of sysctls to be set in containers by default, # A list of sysctls to be set in containers by default,
# specified as "name = value", # specified as "name=value",
# for example:"net.ipv4.ping_group_range = 0 0". # for example:"net.ipv4.ping_group_range=0 0".
# #
default_sysctls = [ default_sysctls = [
"net.ipv4.ping_group_range = 0 0", "net.ipv4.ping_group_range=0 0",
] ]
# A list of ulimits to be set in containers by default, specified as # A list of ulimits to be set in containers by default, specified as
# "<ulimit name> = <soft limit>:<hard limit>", for example: # "<ulimit name>=<soft limit>:<hard limit>", for example:
# "nofile = 1024:2048" # "nofile=1024:2048"
# See setrlimit(2) for a list of resource names. # See setrlimit(2) for a list of resource names.
# Any limit not specified here will be inherited from the process launching the # Any limit not specified here will be inherited from the process launching the
# container engine. # container engine.
# Ulimits has limits for non privileged container engines. # Ulimits has limits for non privileged container engines.
# #
#default_ulimits = [ #default_ulimits = [
# "nofile = 1280:2560", # "nofile=1280:2560",
#] #]
# List of devices. Specified as # List of devices. Specified as
@ -382,7 +382,8 @@ default_sysctls = [
#machine_enabled = false #machine_enabled = false
# The image used when creating a podman-machine VM. # The image used when creating a podman-machine VM.
# machine_image = "testing" #
#machine_image = "testing"
# MultiImageArchive - if true, the container engine allows for storing archives # MultiImageArchive - if true, the container engine allows for storing archives
# (e.g., of the docker-archive transport) with multiple images. By default, # (e.g., of the docker-archive transport) with multiple images. By default,

3
vendor/github.com/containers/common/pkg/parse/parse.go generated vendored
View File

@ -5,6 +5,7 @@ package parse
import ( import (
"os" "os"
"path"
"path/filepath" "path/filepath"
"strings" "strings"
@ -155,7 +156,7 @@ func ValidateVolumeCtrDir(ctrDir string) error {
if ctrDir == "" { if ctrDir == "" {
return errors.New("container directory cannot be empty") return errors.New("container directory cannot be empty")
} }
if !filepath.IsAbs(ctrDir) { if !path.IsAbs(ctrDir) {
return errors.Errorf("invalid container path %q, must be an absolute path", ctrDir) return errors.Errorf("invalid container path %q, must be an absolute path", ctrDir)
} }
return nil return nil

2
vendor/github.com/containers/common/version/version.go generated vendored
View File

@ -1,4 +1,4 @@
package version package version
// Version is the version of the build. // Version is the version of the build.
const Version = "0.43.0" const Version = "0.43.2"

2
vendor/modules.txt vendored
View File

@ -94,7 +94,7 @@ github.com/containers/buildah/pkg/overlay
github.com/containers/buildah/pkg/parse github.com/containers/buildah/pkg/parse
github.com/containers/buildah/pkg/rusage github.com/containers/buildah/pkg/rusage
github.com/containers/buildah/util github.com/containers/buildah/util
# github.com/containers/common v0.43.0 # github.com/containers/common v0.43.2
github.com/containers/common/libimage github.com/containers/common/libimage
github.com/containers/common/libimage/manifests github.com/containers/common/libimage/manifests
github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/apparmor