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

feat(edge) EE-596 Update the version of agent to 2.4.0 in agent deploy command on the adding edge screen (#5021) 

Co-authored-by: Simon Meng <simon.meng@portainer.io>
pull/5031/head
cong meng 2021-04-29 16:25:09 +12:00 committed by GitHub
parent ca849e31a1
commit 7e2ce3ffc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ angular
$scope.randomEdgeID + $scope.randomEdgeID +
' -e EDGE_KEY=' + ' -e EDGE_KEY=' +
$scope.endpoint.EdgeKey + $scope.endpoint.EdgeKey +
' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent' ' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent:2.4.0'
); );
} else if ($scope.state.deploymentTab === 2 && $scope.state.platformType === 'windows') { } else if ($scope.state.deploymentTab === 2 && $scope.state.platformType === 'windows') {
clipboard.copyText( clipboard.copyText(
@ -70,7 +70,7 @@ angular
$scope.randomEdgeID + $scope.randomEdgeID +
' -e EDGE_KEY=' + ' -e EDGE_KEY=' +
$scope.endpoint.EdgeKey + $scope.endpoint.EdgeKey +
' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent' ' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent:2.4.0'
); );
} else if ($scope.state.deploymentTab === 1 && $scope.state.platformType === 'linux') { } else if ($scope.state.deploymentTab === 1 && $scope.state.platformType === 'linux') {
clipboard.copyText( clipboard.copyText(
@ -78,7 +78,7 @@ angular
$scope.randomEdgeID + $scope.randomEdgeID +
' -e EDGE_KEY=' + ' -e EDGE_KEY=' +
$scope.endpoint.EdgeKey + $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/volumes --mount type=bind,src=//,dst=/host --mount type=volume,src=portainer_agent_data,dst=/data portainer/agent" " -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/volumes --mount type=bind,src=//,dst=/host --mount type=volume,src=portainer_agent_data,dst=/data portainer/agent:2.4.0"
); );
} else if ($scope.state.deploymentTab === 1 && $scope.state.platformType === 'windows') { } else if ($scope.state.deploymentTab === 1 && $scope.state.platformType === 'windows') {
clipboard.copyText( clipboard.copyText(
@ -86,7 +86,7 @@ angular
$scope.randomEdgeID + $scope.randomEdgeID +
' -e EDGE_KEY=' + ' -e EDGE_KEY=' +
$scope.endpoint.EdgeKey + $scope.endpoint.EdgeKey +
' -e CAP_HOST_MANAGEMENT=1 --mode global --constraint node.platform.os==windows --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes --mount type=volume,src=portainer_agent_data,dst=C:\\data portainer/agent' ' -e CAP_HOST_MANAGEMENT=1 --mode global --constraint node.platform.os==windows --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes --mount type=volume,src=portainer_agent_data,dst=C:\\data portainer/agent:2.4.0'
); );
} else { } else {
clipboard.copyText('curl https://downloads.portainer.io/portainer-edge-agent-setup.sh | bash -s -- ' + $scope.randomEdgeID + ' ' + $scope.endpoint.EdgeKey); clipboard.copyText('curl https://downloads.portainer.io/portainer-edge-agent-setup.sh | bash -s -- ' + $scope.randomEdgeID + ' ' + $scope.endpoint.EdgeKey);
@ -258,7 +258,7 @@ angular
-e EDGE_KEY=${edgeKey} \\ -e EDGE_KEY=${edgeKey} \\
-e CAP_HOST_MANAGEMENT=1 \\ -e CAP_HOST_MANAGEMENT=1 \\
--name portainer_edge_agent \\ --name portainer_edge_agent \\
portainer/agent`; portainer/agent:2.4.0`;
} }
function buildWindowsStandaloneCommand(edgeId, edgeKey) { function buildWindowsStandaloneCommand(edgeId, edgeKey) {
@ -272,7 +272,7 @@ angular
-e EDGE_KEY=${edgeKey} \\ -e EDGE_KEY=${edgeKey} \\
-e CAP_HOST_MANAGEMENT=1 \\ -e CAP_HOST_MANAGEMENT=1 \\
--name portainer_edge_agent \\ --name portainer_edge_agent \\
portainer/agent`; portainer/agent:2.4.0`;
} }
function buildLinuxSwarmCommand(edgeId, edgeKey) { function buildLinuxSwarmCommand(edgeId, edgeKey) {
@ -294,7 +294,7 @@ docker service create \\
--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 \\
--mount type=bind,src=//,dst=/host \\ --mount type=bind,src=//,dst=/host \\
--mount type=volume,src=portainer_agent_data,dst=/data \\ --mount type=volume,src=portainer_agent_data,dst=/data \\
portainer/agent`; portainer/agent:2.4.0`;
} }
function buildWindowsSwarmCommand(edgeId, edgeKey) { function buildWindowsSwarmCommand(edgeId, edgeKey) {
@ -314,7 +314,7 @@ docker service create \\
--mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine \\ --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine \\
--mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes \\ --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes \\
--mount type=volume,src=portainer_agent_data,dst=C:\\data \\ --mount type=volume,src=portainer_agent_data,dst=C:\\data \\
portainer/agent`; portainer/agent:2.4.0`;
} }
initView(); initView();