diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 05:21:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 05:21:09 -0400 |
| commit | 47d99fb6253238e7603fc96d5b9bbb14f1e8c948 (patch) | |
| tree | 23f7e52d04fe78df60ba1a94c1ef5e7106ff8e82 /pkg/varlinkapi | |
| parent | 8884f6a4f357ea64ad5f20f791ec0a09bdd36352 (diff) | |
| parent | 532c7343a9af5fbdcc682f7f93c987b1f1e49b41 (diff) | |
| download | podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.gz podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.bz2 podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.zip | |
Merge pull request #5647 from rhatdan/containers.conf
Update podmanV2 to use containers.conf
Diffstat (limited to 'pkg/varlinkapi')
| -rw-r--r-- | pkg/varlinkapi/create.go | 2 | ||||
| -rw-r--r-- | pkg/varlinkapi/intermediate_varlink.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/varlinkapi/create.go b/pkg/varlinkapi/create.go index 63d5072c6..571ce6115 100644 --- a/pkg/varlinkapi/create.go +++ b/pkg/varlinkapi/create.go @@ -13,6 +13,7 @@ import ( "syscall" "time" + "github.com/containers/common/pkg/sysinfo" "github.com/containers/image/v5/manifest" "github.com/containers/libpod/cmd/podman/parse" "github.com/containers/libpod/libpod" @@ -28,7 +29,6 @@ import ( "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/seccomp" cc "github.com/containers/libpod/pkg/spec" - "github.com/containers/libpod/pkg/sysinfo" systemdGen "github.com/containers/libpod/pkg/systemd/generate" "github.com/containers/libpod/pkg/util" "github.com/docker/go-connections/nat" diff --git a/pkg/varlinkapi/intermediate_varlink.go b/pkg/varlinkapi/intermediate_varlink.go index 21c57d4f4..bd0c45b33 100644 --- a/pkg/varlinkapi/intermediate_varlink.go +++ b/pkg/varlinkapi/intermediate_varlink.go @@ -331,7 +331,7 @@ func intFromVarlink(v *int64, flagName string, defaultValue *int) CRInt { // structure. func VarlinkCreateToGeneric(opts iopodman.Create) GenericCLIResults { // FIXME this will need to be fixed!!!!! With containers conf - //defaultContainerConfig := cliconfig.GetDefaultConfig() + //containerConfig := cliconfig.GetDefaultConfig() // TODO | WARN // We do not get a default network over varlink. Unlike the other default values for some cli // elements, it seems it gets set to the default anyway. |