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

feat(container-details): update re-creation flow (#2193)

pull/2197/head^2
Anthony Lapenna 2018-08-20 20:55:12 +02:00 committed by GitHub
parent 1b51daf9c4
commit 64beaaa279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/views/containers/create/createContainerController.js
View File

@ -631,8 +631,8 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
return $q.when(); return $q.when();
} }
$scope.state.actionInProgress = true; $scope.state.actionInProgress = true;
return stopAndRenameContainer(oldContainer) return pullImageIfNeeded()
.then(pullImageIfNeeded) .then(stopAndRenameContainer(oldContainer))
.then(createNewContainer) .then(createNewContainer)
.then(applyResourceControl) .then(applyResourceControl)
.then(connectToExtraNetworks) .then(connectToExtraNetworks)

4
app/docker/views/containers/edit/containerController.js
View File

@ -196,9 +196,9 @@ function ($q, $scope, $state, $transition$, $filter, Commit, ContainerHelper, Co
$scope.state.recreateContainerInProgress = true; $scope.state.recreateContainerInProgress = true;
var isRunning = container.State.Running; var isRunning = container.State.Running;
return stopContainerIfNeeded() return pullImageIfNeeded()
.then(stopContainerIfNeeded)
.then(renameContainer) .then(renameContainer)
.then(pullImageIfNeeded)
.then(setMainNetworkAndCreateContainer) .then(setMainNetworkAndCreateContainer)
.then(connectContainerToOtherNetworks) .then(connectContainerToOtherNetworks)
.then(startContainerIfNeeded) .then(startContainerIfNeeded)