diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-01-06 14:50:12 +0100 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-01-12 17:40:12 +0100 |
| commit | 0151e10b627fbfb82b7d633f3fc9703678ed4eaf (patch) | |
| tree | dea285c6d5069c90e7e32694b24f60d7c10a94eb /pkg/api/handlers/compat | |
| parent | 495884b3195de482dc610a2a002db7e053188a32 (diff) | |
| download | podman-0151e10b627fbfb82b7d633f3fc9703678ed4eaf.tar.gz podman-0151e10b627fbfb82b7d633f3fc9703678ed4eaf.tar.bz2 podman-0151e10b627fbfb82b7d633f3fc9703678ed4eaf.zip | |
update buildah to latest and use new network stack
Make sure buildah uses the new network stack.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/api/handlers/compat')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 2d296b5ce..1a5665152 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -16,7 +16,6 @@ import ( "github.com/containers/buildah" buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/parse" - "github.com/containers/buildah/util" "github.com/containers/image/v5/types" "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/pkg/api/handlers/utils" @@ -491,11 +490,6 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { defer reporter.Close() runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime) - rtc, err := runtime.GetConfig() - if err != nil { - utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Decode()")) - return - } buildOptions := buildahDefine.BuildOptions{ AddCapabilities: addCaps, AdditionalTags: additionalTags, @@ -522,8 +516,6 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { Ulimit: ulimits, Secrets: secrets, }, - CNIConfigDir: rtc.Network.CNIPluginDirs[0], - CNIPluginPath: util.DefaultCNIPluginPath, Compression: compression, ConfigureNetwork: parseNetworkConfigurationPolicy(query.ConfigureNetwork), ContextDirectory: contextDirectory, |