From 1edf9813307e279f78428d52e172bfecc0792a07 Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Tue, 28 Jul 2020 00:52:54 +0300
Subject: [PATCH] fix(container-creation): preselect network (#4117)

---
 .../views/containers/create/createContainerController.js | 5 ++---
 app/docker/views/containers/create/createcontainer.html  | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 965364b72..412cfdadf 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -626,10 +626,9 @@ angular.module('portainer.docker').controller('CreateContainerController', [
       var provider = $scope.applicationState.endpoint.mode.provider;
       var apiVersion = $scope.applicationState.endpoint.apiVersion;
       NetworkService.networks(provider === 'DOCKER_STANDALONE' || provider === 'DOCKER_SWARM_MODE', false, provider === 'DOCKER_SWARM_MODE' && apiVersion >= 1.25)
-        .then(function success(data) {
-          var networks = data;
+        .then(function success(networks) {
           networks.push({ Name: 'container' });
-          $scope.availableNetworks = networks;
+          $scope.availableNetworks = networks.sort((a, b) => a.Name.localeCompare(b.Name));
 
           if (_.find(networks, { Name: 'nat' })) {
             $scope.config.HostConfig.NetworkMode = 'nat';
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 39ba8be71..5ee68a229 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -394,9 +394,14 @@
               <div class="form-group">
                 <label for="container_network" class="col-sm-2 col-lg-1 control-label text-left">Network</label>
                 <div class="col-sm-9">
-                  <select class="form-control" ng-model="config.HostConfig.NetworkMode" id="container_network" ng-change="resetNetworkConfig()">
+                  <select
+                    class="form-control"
+                    ng-options="net.Name as net.Name for net in availableNetworks"
+                    ng-model="config.HostConfig.NetworkMode"
+                    id="container_network"
+                    ng-change="resetNetworkConfig()"
+                  >
                     <option selected disabled hidden value="">Select a network</option>
-                    <option ng-repeat="net in availableNetworks | orderBy: 'Name'" ng-value="net.Name">{{ net.Name }}</option>
                   </select>
                 </div>
               </div>