Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 05:19:39 +02:00
Code Issues Releases Activity

feat(config): add base url support EE-506 (#5999)

Browse source
This commit is contained in:
Prabhat Khera 2021-12-03 14:34:45 +13:00 • committed by GitHub
parent 335f951e6b
commit 4aea5690a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 71 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/docker/views/containers/console/containerConsoleController.js
View file

@ -1,4 +1,5 @@
import { Terminal } from 'xterm';
import { baseHref } from '@/portainer/helpers/pathHelper';
angular.module('portainer.docker').controller('ContainerConsoleController', [
'$scope',
@ -69,7 +70,8 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
};
var url =
window.location.href.split('#')[0] +
window.location.origin +
baseHref() +
'api/websocket/attach?' +
Object.keys(params)
.map((k) => k + '=' + params[k])
@ -109,7 +111,8 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
};
var url =
window.location.href.split('#')[0] +
window.location.origin +
baseHref() +
'api/websocket/exec?' +
Object.keys(params)
.map((k) => k + '=' + params[k])