opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use containers/storage/pkg/regexp in place of regexp

Browse Source 
This is a cleaner solution and guarantees the variables
will be used before they are initialized.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2023-01-12 18:31:19 -05:00
parent c433982d18
commit c2b36beb40
4 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/options.go
View File

@ -6,9 +6,7 @@ import (
"net"
"os"
"path/filepath"
"regexp"
"strings"
"sync"
"syscall"
"github.com/containers/buildah/pkg/parse"
@ -25,15 +23,13 @@ import (
"github.com/containers/podman/v4/pkg/util"
"github.com/containers/storage"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/regexp"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate"
"github.com/sirupsen/logrus"
)
var (
umaskRegex *regexp.Regexp
onceRegex sync.Once
)
var umaskRegex = regexp.Delayed(`^[0-7]{1,4}$`)
// WithStorageConfig uses the given configuration to set up container storage.
// If this is not specified, the system default configuration will be used
@ -1797,9 +1793,6 @@ func WithTimezone(path string) CtrCreateOption {
// WithUmask sets the umask in the container
func WithUmask(umask string) CtrCreateOption {
onceRegex.Do(func() {
umaskRegex = regexp.MustCompile(`^[0-7]{1,4}$`)
})
return func(ctr *Container) error {
if ctr.valid {
return define.ErrCtrFinalized