Skip to content

Fixed creating stacks for non swarm Docker #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cruaier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed creating stacks for non swarm Docker #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions portainer_cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def login(self, username, password):
def get_users(self):
users_url = 'users'
return self.request(users_url, self.METHOD_GET).json()

# retrieve users by their names
def get_users_by_name(self, names):
all_users = self.get_users()
Expand All @@ -172,7 +172,7 @@ def get_users_by_name(self, names):
logger.debug('User with name \'{}\' found'.format(name))
users.append(user)
return users

# retrieve users by their names
def get_users_by_name(self, names):
all_users = self.get_users()
Expand All @@ -189,7 +189,7 @@ def get_users_by_name(self, names):
logger.debug('User with name \'{}\' found'.format(name))
users.append(user)
return users

def get_teams(self):
teams_url = 'teams'
return self.request(teams_url, self.METHOD_GET).json()
Expand Down Expand Up @@ -224,7 +224,7 @@ def get_stack_by_id(self, stack_id, endpoint_id):
if not stack:
raise Exception('Stack with id={} does not exist'.format(stack_id))
return stack

def get_stack_by_name(self, stack_name, endpoint_id, mandatory=False):
result = self.get_stacks()
if result:
Expand Down Expand Up @@ -295,12 +295,13 @@ def create_or_update_stack(self, stack_name, endpoint_id, stack_file='', env_fil
)
def create_stack(self, stack_name, endpoint_id, stack_file='', env_file='', *args):
logger.info('Creating stack name={}'.format(stack_name))
stack_url = 'stacks?type=1&method=string&endpointId={}'.format(
endpoint_id
)
swarm_url = 'endpoints/{}/docker/swarm'.format(endpoint_id)
swarm_id = self.request(swarm_url, self.METHOD_GET).json().get('ID')
self.swarm_id = swarm_id
stack_url = 'stacks?type={}&method=string&endpointId={}'.format(
1 if swarm_id is not None else 2,
endpoint_id
)
stack_file_content = open(stack_file).read()

env = self.extract_env(env_file, *args)
Expand All @@ -312,17 +313,19 @@ def create_stack(self, stack_name, endpoint_id, stack_file='', env_file='', *arg
)
data = {
'StackFileContent': stack_file_content,
'SwarmID': self.swarm_id,
'Name': stack_name,
'Env': final_env if len(final_env) > 0 else []
}
if self.swarm_id is not None:
data['SwarmID'] = self.swarm_id

logger.debug('create stack data: {}'.format(data))
self.request(
stack_url,
self.METHOD_POST,
data,
)

def create_or_update_resource_control(self, stack, public, users, teams):
resource_control = stack['ResourceControl']
if resource_control and resource_control['Id'] != 0:
Expand Down