Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 07:19:41 +02:00
Code Issues Releases Activity

fix(container-creation): preserve network aliases (#3401)

Browse source
This commit is contained in:
William 2019-11-28 09:35:14 +13:00 • committed by Anthony Lapenna
parent 7f54584ed6
commit 61c38534a7
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/docker/views/containers/create/createContainerController.js
View file

@ -208,7 +208,8 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
IPAMConfig: {
IPv4Address: $scope.formValues.IPv4,
IPv6Address: $scope.formValues.IPv6
}
},
Aliases: _.without($scope.config.NetworkingConfig.EndpointsConfig[networkMode].Aliases, $scope.config.Hostname)
};
$scope.formValues.ExtraHosts.forEach(function (v) {
@ -780,9 +781,9 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
return $q.when();
}
var connectionPromises = Object.keys($scope.extraNetworks).map(function (networkName) {
return NetworkService.connectContainer(networkName, newContainerId);
});
var connectionPromises = _.forOwn($scope.extraNetworks, function (network, networkName) {
return NetworkService.connectContainer(networkName, newContainerId, _.without(network.Aliases, $scope.config.Hostname));
});
return $q.all(connectionPromises);
}