summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-09 05:11:24 -0800
committerGitHub <noreply@github.com>2019-03-09 05:11:24 -0800
commitd95f97a63e03b4602ffeb80acb746fa6dfa6f7a1 (patch)
tree819864632da9517fdd5221531a28cb706f2a6355 /libpod
parent68a984a9376d6258913ae130d52d6037339e87bf (diff)
parent2f3875d0098093fa740d871b81e91a8533fe9878 (diff)
downloadpodman-d95f97a63e03b4602ffeb80acb746fa6dfa6f7a1.tar.gz
podman-d95f97a63e03b4602ffeb80acb746fa6dfa6f7a1.tar.bz2
podman-d95f97a63e03b4602ffeb80acb746fa6dfa6f7a1.zip
Merge pull request #2516 from rhatdan/secrets
Move secrets package to buildah
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 5f9e5a20c..f50092550 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -18,13 +18,13 @@ import (
cnitypes "github.com/containernetworking/cni/pkg/types/current"
"github.com/containernetworking/plugins/pkg/ns"
+ "github.com/containers/buildah/pkg/secrets"
crioAnnotations "github.com/containers/libpod/pkg/annotations"
"github.com/containers/libpod/pkg/apparmor"
"github.com/containers/libpod/pkg/criu"
"github.com/containers/libpod/pkg/lookup"
"github.com/containers/libpod/pkg/resolvconf"
"github.com/containers/libpod/pkg/rootless"
- "github.com/containers/libpod/pkg/secrets"
"github.com/containers/storage/pkg/idtools"
"github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go"