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

feat(agent): support agent deployed on standalone engine endpoint (#2061)

pull/2063/head
Anthony Lapenna 2018-07-23 11:31:21 +02:00 committed by GitHub
parent 3c6f6cf5bf
commit 7225619456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/docker/helpers/infoHelper.js
View File

@ -12,10 +12,7 @@ angular.module('portainer.docker')
};
if (type === 2) {
mode.provider = 'DOCKER_SWARM_MODE';
mode.role = 'MANAGER';
mode.agentProxy = true;
return mode;
}
if (!info.Swarm || _.isEmpty(info.Swarm.NodeID)) {

4
app/docker/views/containers/containers.html
View File

@ -12,9 +12,9 @@
<containers-datatable
title-text="Containers" title-icon="fa-server"
dataset="containers" table-key="containers"
order-by="Status"
order-by="Status"
show-ownership-column="applicationState.application.authentication"
show-host-column="applicationState.endpoint.mode.agentProxy"
show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
show-add-action="true"
></containers-datatable>
</div>

2
app/docker/views/containers/create/createcontainer.html
View File

@ -107,7 +107,7 @@
<!-- !port-mapping-input-list -->
</div>
<!-- !port-mapping -->
<div ng-if="applicationState.endpoint.mode.agentProxy">
<div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="col-sm-12 form-section-title">
Deployment
</div>

8
app/docker/views/dashboard/dashboard.html
View File

@ -3,14 +3,14 @@
<rd-header-content>Endpoint summary</rd-header-content>
</rd-header>
<div class="row" ng-if="applicationState.endpoint.mode.agentProxy">
<div class="row" ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="col-sm-12">
<dashboard-cluster-agent-info></dashboard-cluster-agent-info>
</div>
</div>
<div class="row" ng-if="!applicationState.endpoint.mode.agentProxy">
<div class="col-sm-12" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="row" ng-if="!applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="col-sm-12">
<rd-widget>
<rd-widget-body>
<div class="col-sm-12 form-section-title">
@ -32,7 +32,9 @@
</rd-widget-body>
</rd-widget>
</div>
</div>
<div class="row" ng-if="!applicationState.endpoint.mode.agentProxy || applicationState.endpoint.mode.provider !== 'DOCKER_SWARM_MODE'">
<div class="col-sm-12">
<rd-widget>
<rd-widget-header icon="fa-tachometer-alt" title-text="Node info"></rd-widget-header>

2
app/docker/views/images/build/buildimage.html
View File

@ -194,7 +194,7 @@
</div>
</div>
<!-- !url -->
<div ng-if="applicationState.endpoint.mode.agentProxy">
<div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="col-sm-12 form-section-title">
Deployment
</div>

6
app/docker/views/images/images.html
View File

@ -28,7 +28,7 @@
</div>
</div>
<!-- !tag-note -->
<div ng-if="applicationState.endpoint.mode.agentProxy">
<div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
<div class="col-sm-12 form-section-title">
Deployment
</div>
@ -57,8 +57,8 @@
<images-datatable
title-text="Images" title-icon="fa-clone"
dataset="images" table-key="images"
order-by="RepoTags"
show-host-column="applicationState.endpoint.mode.agentProxy"
order-by="RepoTags"
show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
remove-action="removeAction"
force-remove-action="confirmRemovalAction"
></images-datatable>

2
app/docker/views/networks/create/createnetwork.html
View File

@ -119,7 +119,7 @@
</div>
</div>
<!-- !internal -->
<div ng-if="applicationState.endpoint.mode.agentProxy && config.Driver !== 'overlay'">
<div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && config.Driver !== 'overlay'">
<div class="col-sm-12 form-section-title">
Deployment
</div>

4
app/docker/views/networks/networks.html
View File

@ -12,10 +12,10 @@
<networks-datatable
title-text="Networks" title-icon="fa-sitemap"
dataset="networks" table-key="networks"
order-by="Name"
order-by="Name"
remove-action="removeAction"
show-ownership-column="applicationState.application.authentication"
show-host-column="applicationState.endpoint.mode.agentProxy"
show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
></networks-datatable>
</div>
</div>

2
app/docker/views/volumes/create/createvolume.html
View File

@ -70,7 +70,7 @@
<storidge-profile-selector storidge-profile="formValues.StoridgeProfile"></storidge-profile-selector>
</div>
<!-- storidge -->
<div ng-if="applicationState.endpoint.mode.agentProxy && formValues.Driver === 'local'">
<div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && formValues.Driver === 'local'">
<div class="col-sm-12 form-section-title">
Deployment
</div>

2
app/docker/views/volumes/volumes.html
View File

@ -15,7 +15,7 @@
order-by="Id"
remove-action="removeAction"
show-ownership-column="applicationState.application.authentication"
show-host-column="applicationState.endpoint.mode.agentProxy"
show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
show-browse-action="applicationState.endpoint.mode.agentProxy"
></volumes-datatable>
</div>

2
app/portainer/views/stacks/edit/stack.html
View File

@ -186,7 +186,7 @@
dataset="services" table-key="stack-services"
order-by="Name"
nodes="nodes"
agent-proxy="applicationState.endpoint.mode.agentProxy"
agent-proxy="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
show-ownership-column="false"
show-update-action="applicationState.endpoint.apiVersion >= 1.25"
show-task-logs-button="applicationState.endpoint.apiVersion >= 1.30"