diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-29 17:14:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 17:14:26 +0000 |
| commit | 26b0ebd22f0a516eae9daf2439697f1f793894cc (patch) | |
| tree | ee369f8ec30af3b74d29787e43799b2fb7eed8f9 /libpod | |
| parent | b7bb8a1fb942a0568a1ff257798702bd0cde5d37 (diff) | |
| parent | 127400880a1a3d53d4d4eb454cc9f35ddc89e79a (diff) | |
| download | podman-26b0ebd22f0a516eae9daf2439697f1f793894cc.tar.gz podman-26b0ebd22f0a516eae9daf2439697f1f793894cc.tar.bz2 podman-26b0ebd22f0a516eae9daf2439697f1f793894cc.zip | |
Merge pull request #9516 from rhatdan/shrink
[NO TESTS NEEDED] Shrink the size of podman bindings
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/events/logfile.go | 4 | ||||
| -rw-r--r-- | libpod/runtime_img.go | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 7a32ea311..0f00525e8 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -7,7 +7,7 @@ import ( "time" "github.com/containers/podman/v3/pkg/util" - "github.com/containers/storage" + "github.com/containers/storage/pkg/lockfile" "github.com/pkg/errors" ) @@ -20,7 +20,7 @@ type EventLogFile struct { // Writes to the log file func (e EventLogFile) Write(ee Event) error { // We need to lock events file - lock, err := storage.GetLockfile(e.options.LogFilePath + ".lock") + lock, err := lockfile.GetLockfile(e.options.LogFilePath + ".lock") if err != nil { return err } diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 13ac42e7d..b427125db 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -9,6 +9,7 @@ import ( "net/url" "os" + buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/imagebuildah" "github.com/containers/image/v5/directory" "github.com/containers/image/v5/docker/reference" @@ -165,7 +166,7 @@ func (r *Runtime) newImageBuildCompleteEvent(idOrName string) { } // Build adds the runtime to the imagebuildah call -func (r *Runtime) Build(ctx context.Context, options imagebuildah.BuildOptions, dockerfiles ...string) (string, reference.Canonical, error) { +func (r *Runtime) Build(ctx context.Context, options buildahDefine.BuildOptions, dockerfiles ...string) (string, reference.Canonical, error) { if options.Runtime == "" { // Make sure that build containers use the same runtime as Podman (see #9365). conf := util.DefaultContainerConfig() |