diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-29 09:49:38 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 14:00:14 -0400 |
| commit | 32f61dbf73538ea97a0cdabb6593c5a2b96f7171 (patch) | |
| tree | a85a7d87a11e5bb8615850bd853b88f332fed92b /libpod | |
| parent | c8130be174e0f5209661ab454bee37a3765d1b04 (diff) | |
| download | podman-32f61dbf73538ea97a0cdabb6593c5a2b96f7171.tar.gz podman-32f61dbf73538ea97a0cdabb6593c5a2b96f7171.tar.bz2 podman-32f61dbf73538ea97a0cdabb6593c5a2b96f7171.zip | |
[NO TESTS NEEDED] Shrink the size of podman-remote
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 8f49a18b6..3588467a5 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 == "" { options.Runtime = r.GetOCIRuntimePath() } |