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

fix(app/stacks): swarm stack duplicate and migrate errors [EE-5520] (#9039) 

* fix(dev): dev container script

* fix(app/stacks): make swarm stack migrate effectively target the target env and not the current env

* fix(app/stacks): make stack duplicate save the target swarm id on duplicated swarm stack
pull/9051/head
LP B 2023-06-07 14:28:40 +02:00 committed by GitHub
parent c7756f3018
commit 73950f3603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/services/swarmService.js
View File

@ -7,10 +7,10 @@ angular.module('portainer.docker').factory('SwarmService', [
'use strict'; 'use strict';
var service = {}; var service = {};
service.swarm = function () { service.swarm = function (endpointId) {
var deferred = $q.defer(); var deferred = $q.defer();
Swarm.get() Swarm.get(endpointId ? { endpointId } : undefined)
.$promise.then(function success(data) { .$promise.then(function success(data) {
var swarm = new SwarmViewModel(data); var swarm = new SwarmViewModel(data);
deferred.resolve(swarm); deferred.resolve(swarm);

4
app/portainer/services/api/stackService.js
View File

@ -50,7 +50,7 @@ angular.module('portainer.app').factory('StackService', [
service.migrateSwarmStack = function (stack, targetEndpointId, newName) { service.migrateSwarmStack = function (stack, targetEndpointId, newName) {
var deferred = $q.defer(); var deferred = $q.defer();
SwarmService.swarm() SwarmService.swarm(targetEndpointId)
.then(function success(data) { .then(function success(data) {
var swarm = data; var swarm = data;
if (swarm.Id === stack.SwarmId) { if (swarm.Id === stack.SwarmId) {
@ -324,7 +324,7 @@ angular.module('portainer.app').factory('StackService', [
service.createSwarmStackFromFileContent = function (name, stackFileContent, env, endpointId) { service.createSwarmStackFromFileContent = function (name, stackFileContent, env, endpointId) {
var deferred = $q.defer(); var deferred = $q.defer();
SwarmService.swarm() SwarmService.swarm(endpointId)
.then(function success(swarm) { .then(function success(swarm) {
var payload = { var payload = {
Name: name, Name: name,

5
dev/run_container.sh
View File

@ -5,7 +5,7 @@ PORTAINER_DATA=${PORTAINER_DATA:-/tmp/portainer}
PORTAINER_PROJECT=${PORTAINER_PROJECT:-$(pwd)} PORTAINER_PROJECT=${PORTAINER_PROJECT:-$(pwd)}
PORTAINER_FLAGS=${PORTAINER_FLAGS:-} PORTAINER_FLAGS=${PORTAINER_FLAGS:-}
docker rm -f portainer > /dev/null docker rm -f portainer
docker run -d \ docker run -d \
-p 8000:8000 \ -p 8000:8000 \
@ -17,6 +17,5 @@ docker run -d \
-v /var/run/docker.sock:/var/run/alternative.sock:z \ -v /var/run/docker.sock:/var/run/alternative.sock:z \
-v /tmp:/tmp \ -v /tmp:/tmp \
--name portainer \ --name portainer \
--rm \
portainer/base \ portainer/base \
/app/portainer ${PORTAINER_FLAGS} /app/portainer $PORTAINER_FLAGS