github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stacks): prevent stack creation when container_name already exists (#5211)

fix/EE-1152/importing-images
Chaim Lev-Ari 2021-07-21 04:55:06 +03:00 committed by GitHub
parent 00fc629c1c
commit 592f7024e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/portainer/views/stacks/create/createStackController.js
View File

@ -232,8 +232,8 @@ angular
} }
try { try {
$scope.containers = await ContainerService.containers(); const containers = await ContainerService.containers(true);
$scope.containerNames = ContainerHelper.getContainerNames($scope.containers); $scope.containerNames = ContainerHelper.getContainerNames(containers);
} catch (err) { } catch (err) {
Notifications.error('Failure', err, 'Unable to retrieve Containers'); Notifications.error('Failure', err, 'Unable to retrieve Containers');
} }

2
app/portainer/views/stacks/edit/stackController.js
View File

@ -291,7 +291,7 @@ angular.module('portainer.app').controller('StackController', [
$q.all({ $q.all({
stack: StackService.stack(id), stack: StackService.stack(id),
groups: GroupService.groups(), groups: GroupService.groups(),
containers: ContainerService.containers(), containers: ContainerService.containers(true),
}) })
.then(function success(data) { .then(function success(data) {
var stack = data.stack; var stack = data.stack;