Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +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

3
app/kubernetes/components/kubectl-shell/kubectl-shell.controller.js
View file

@ -1,5 +1,6 @@
import { Terminal } from 'xterm';
import * as fit from 'xterm/lib/addons/fit/fit';
import { baseHref } from '@/portainer/helpers/pathHelper';
export default class KubectlShellController {
/* @ngInject */
@ -91,7 +92,7 @@ export default class KubectlShellController {
};
const wsProtocol = this.$window.location.protocol === 'https:' ? 'wss://' : 'ws://';
const path = '/api/websocket/kubernetes-shell';
const path = baseHref() + 'api/websocket/kubernetes-shell';
const queryParams = Object.entries(params)
.map(([k, v]) => `${k}=${v}`)
.join('&');

4
app/kubernetes/views/applications/console/consoleController.js
View file

@ -1,5 +1,6 @@
import angular from 'angular';
import { Terminal } from 'xterm';
import { baseHref } from '@/portainer/helpers/pathHelper';
class KubernetesApplicationConsoleController {
/* @ngInject */
@ -59,7 +60,8 @@ class KubernetesApplicationConsoleController {
};
let url =
window.location.href.split('#')[0] +
window.location.origin +
baseHref() +
'api/websocket/pod?' +
Object.keys(params)
.map((k) => k + '=' + params[k])