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

refactor(endpoint-creation): remove unneeded port (#3467) 

* refactor(endpoint-creation): remove unneeded port

* refactor(endpoint-creation): remove from clipboard
pull/3409/head
William 2020-01-22 09:17:41 +13:00 committed by Anthony Lapenna
parent 17bc17f638
commit 9da08bc792
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/portainer/views/endpoints/edit/endpoint.html
View File

@ -45,7 +45,6 @@
-e EDGE_ID={{ randomEdgeID }} \ -e EDGE_ID={{ randomEdgeID }} \
-e EDGE_KEY={{ endpoint.EdgeKey }} \ -e EDGE_KEY={{ endpoint.EdgeKey }} \
-e CAP_HOST_MANAGEMENT=1 \ -e CAP_HOST_MANAGEMENT=1 \
-p 8000:80 \
-v portainer_agent_data:/data \ -v portainer_agent_data:/data \
--name portainer_edge_agent \ --name portainer_edge_agent \
portainer/agent portainer/agent
@ -66,7 +65,6 @@
-e EDGE_KEY={{ endpoint.EdgeKey }} \ -e EDGE_KEY={{ endpoint.EdgeKey }} \
-e CAP_HOST_MANAGEMENT=1 \ -e CAP_HOST_MANAGEMENT=1 \
--mode global \ --mode global \
--publish mode=host,published=8000,target=80 \
--constraint 'node.platform.os == linux' \ --constraint 'node.platform.os == linux' \
--mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock \ --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock \
--mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volumes \ --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volumes \

4
app/portainer/views/endpoints/edit/endpointController.js
View File

@ -22,9 +22,9 @@ function ($q, $scope, $state, $transition$, $filter, clipboard, EndpointService,
$scope.copyEdgeAgentDeploymentCommand = function() { $scope.copyEdgeAgentDeploymentCommand = function() {
if ($scope.state.deploymentTab === 0) { if ($scope.state.deploymentTab === 0) {
clipboard.copyText('docker run -d -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes -v /:/host --restart always -e EDGE=1 -e EDGE_ID=' + $scope.randomEdgeID + ' -e EDGE_KEY=' + $scope.endpoint.EdgeKey +' -e CAP_HOST_MANAGEMENT=1 -p 8000:80 -v portainer_agent_data:/data --name portainer_edge_agent portainer/agent'); clipboard.copyText('docker run -d -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes -v /:/host --restart always -e EDGE=1 -e EDGE_ID=' + $scope.randomEdgeID + ' -e EDGE_KEY=' + $scope.endpoint.EdgeKey +' -e CAP_HOST_MANAGEMENT=1 -v portainer_agent_data:/data --name portainer_edge_agent portainer/agent');
} else { } else {
clipboard.copyText('docker network create --driver overlay portainer_agent_network; docker service create --name portainer_edge_agent --network portainer_agent_network -e AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent -e EDGE=1 -e EDGE_ID=' + $scope.randomEdgeID + ' -e EDGE_KEY=' + $scope.endpoint.EdgeKey +' -e CAP_HOST_MANAGEMENT=1 --mode global --publish mode=host,published=8000,target=80 --constraint \'node.platform.os == linux\' --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volume --mount type=bind,src=//,dst=/host --mount type=volume,src=portainer_agent_data,dst=/data portainer/agent'); clipboard.copyText('docker network create --driver overlay portainer_agent_network; docker service create --name portainer_edge_agent --network portainer_agent_network -e AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent -e EDGE=1 -e EDGE_ID=' + $scope.randomEdgeID + ' -e EDGE_KEY=' + $scope.endpoint.EdgeKey +' -e CAP_HOST_MANAGEMENT=1 --mode global --constraint \'node.platform.os == linux\' --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volume --mount type=bind,src=//,dst=/host --mount type=volume,src=portainer_agent_data,dst=/data portainer/agent');
} }
$('#copyNotificationDeploymentCommand').show().fadeOut(2500); $('#copyNotificationDeploymentCommand').show().fadeOut(2500);
}; };