feat(endpoint-details): add edge-key to commands (#3302)

app/portainer/views/endpoints/edit/endpoint.html

@@ -28,7 +28,10 @@
     <span class="small text-muted">
       <p>
         <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-        Deploy the Edge agent on your remote Docker environment using the following command
+        Deploy the Edge agent on your remote Docker environment using the following command(s)
+      </p>
+      <p>
+        The agent will communicate with Portainer via <u>{{ edgeKeyDetails.instanceURL }}</u> and <u>tcp://{{ edgeKeyDetails.tunnelServerAddr }}</u>
       </p>
      <div style="margin-top: 10px;">
        <uib-tabset active="state.deploymentTab">
@@ -40,6 +43,7 @@
               --restart always \
               -e EDGE=1 \
               -e EDGE_ID={{ randomEdgeID }} \
+              -e EDGE_KEY={{ endpoint.EdgeKey }} \
               -e CAP_HOST_MANAGEMENT=1 \
               -p 8000:80 \
               -v portainer_agent_data:/data \
@@ -59,6 +63,7 @@
               -e AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent \
               -e EDGE=1 \
               -e EDGE_ID={{ randomEdgeID }} \
+              -e EDGE_KEY={{ endpoint.EdgeKey }} \
               -e CAP_HOST_MANAGEMENT=1 \
               --mode global \
               --publish mode=host,published=8000,target=80 \
@@ -83,10 +88,10 @@
       </div>
       <p>
         <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-        Use the following join token to associate the Edge agent with this endpoint
+        For those prestaging the edge agent, use the following join token to associate the Edge agent with this endpoint.
       </p>
       <p>
-          The agent will communicate with Portainer via <u>{{ edgeKeyDetails.instanceURL }}</u> and <u>tcp://{{ edgeKeyDetails.tunnelServerAddr }}</u>
+        You can read more about pre-staging in the userguide available <a href="https://downloads.portainer.io/edge_agent_guide.pdf">here.</a>
       </p>
       <div style="margin-top: 10px; overflow-wrap: break-word;">
        <code>

app/portainer/views/endpoints/edit/endpointController.js

@@ -22,9 +22,9 @@ function ($q, $scope, $state, $transition$, $filter, clipboard, EndpointService,
 
   $scope.copyEdgeAgentDeploymentCommand = function() {
     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 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 -p 8000:80 -v portainer_agent_data:/data --name portainer_edge_agent portainer/agent');
     } 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 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 --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');
     }
     $('#copyNotificationDeploymentCommand').show().fadeOut(2500);
   };