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

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])

24
app/docker/views/images/import/importimage.html
View file

@ -19,9 +19,7 @@
</div>
<div class="form-group">
<div class="col-sm-12">
<button type="button" class="btn btn-sm btn-primary" ngf-select ngf-min-size="10" ng-model="formValues.UploadFile"
>Select file</button
>
<button type="button" class="btn btn-sm btn-primary" ngf-select ngf-min-size="10" ng-model="formValues.UploadFile">Select file</button>
<span style="margin-left: 5px;">
{{ formValues.UploadFile.name }}
<i class="fa fa-times red-icon" ng-if="!formValues.UploadFile" aria-hidden="true"></i>
@ -42,16 +40,16 @@
<rd-widget>
<rd-widget-header icon="fa-tag" title-text="Tag the image"></rd-widget-header>
<rd-widget-body>
<!-- image-and-registry -->
<por-image-registry
model="formValues.RegistryModel"
label-class="col-sm-1"
input-class="col-sm-11"
endpoint="endpoint"
is-admin="isAdmin"
set-validity="setPullImageValidity"
check-rate-limits="true"
></por-image-registry>
<!-- image-and-registry -->
<por-image-registry
model="formValues.RegistryModel"
label-class="col-sm-1"
input-class="col-sm-11"
endpoint="endpoint"
is-admin="isAdmin"
set-validity="setPullImageValidity"
check-rate-limits="true"
></por-image-registry>
</rd-widget-body>
</rd-widget>
</div>