Also includes unreleased https://github.com/openshift/imagebuilder/pull/246 to work
with the updated docker/docker dependency.

And updates some references to newly deprecated docker/docker symbols.

[NO NEW TESTS NEEDED]

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2023-01-25 19:22:41 +01:00
parent 83f2f840e4
commit e308ba0215
292 changed files with 7975 additions and 5113 deletions

View File

@ -12,8 +12,8 @@ import (
"strings"
"unicode"
"github.com/docker/docker/pkg/system"
"github.com/openshift/imagebuilder/dockerfile/command"
"github.com/containers/storage/pkg/system"
"github.com/pkg/errors"
)