Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-10 08:15:25 +02:00
Code Issues Releases Activity

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

Browse source 
* 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
This commit is contained in:
LP B 2023-06-07 14:28:36 +02:00 • committed by GitHub
parent c8c590846c
commit d508052bfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 20 deletions
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';
var service = {};
service.swarm = function () {
service.swarm = function (endpointId) {
var deferred = $q.defer();
Swarm.get()
Swarm.get(endpointId ? { endpointId } : undefined)
.$promise.then(function success(data) {
var swarm = new SwarmViewModel(data);
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) {
var deferred = $q.defer();
SwarmService.swarm()
SwarmService.swarm(targetEndpointId)
.then(function success(data) {
var swarm = data;
if (swarm.Id === stack.SwarmId) {
@ -324,7 +324,7 @@ angular.module('portainer.app').factory('StackService', [
service.createSwarmStackFromFileContent = function (name, stackFileContent, env, endpointId) {
var deferred = $q.defer();
SwarmService.swarm()
SwarmService.swarm(endpointId)
.then(function success(swarm) {
var payload = {
Name: name,

30
dev/run_container.sh
View file

@ -2,23 +2,21 @@
set -euo pipefail
IFS=$'\n\t'
PORTAINER_DATA=${PORTAINER_DATA:-/tmp/portainer};
PORTAINER_PROJECT=${PORTAINER_PROJECT:-$(pwd)};
PORTAINER_FLAGS=${PORTAINER_FLAGS:-};
PORTAINER_DATA=${PORTAINER_DATA:-/tmp/portainer}
PORTAINER_PROJECT=${PORTAINER_PROJECT:-$(pwd)}
PORTAINER_FLAGS=${PORTAINER_FLAGS:-}
docker rm -f portainer
docker run -d \
-p 8000:8000 \
-p 9000:9000 \
-p 9443:9443 \
-v "$PORTAINER_PROJECT/dist:/app" \
-v "$PORTAINER_DATA:/data" \
-v /var/run/docker.sock:/var/run/docker.sock:z \
-v /var/run/docker.sock:/var/run/alternative.sock:z \
-v /tmp:/tmp \
--name portainer \
--rm \
portainer/base \
/app/portainer "${@:PORTAINER_FLAGS}"
-p 8000:8000 \
-p 9000:9000 \
-p 9443:9443 \
-v "$PORTAINER_PROJECT/dist:/app" \
-v "$PORTAINER_DATA:/data" \
-v /var/run/docker.sock:/var/run/docker.sock:z \
-v /var/run/docker.sock:/var/run/alternative.sock:z \
-v /tmp:/tmp \
--name portainer \
portainer/base \
/app/portainer $PORTAINER_FLAGS