Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 21:35:23 +02:00
Code Issues Releases Activity

fix(docker): remove word break in details [EE-4481] (#7996)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-11-22 15:00:55 +02:00 • committed by GitHub
parent fe8e834dbf
commit d484a0eb64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 178 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/docker/filters/filters.js
View file

@ -1,5 +1,5 @@
import _ from 'lodash-es';
import { trimSHA } from './utils';
import { joinCommand, trimSHA } from './utils';
function includeString(text, values) {
return values.some(function (val) {
@ -191,12 +191,7 @@ angular
};
})
.filter('command', function () {
'use strict';
return function (command) {
if (command) {
return command.join(' ');
}
};
return joinCommand;
})
.filter('hideshasum', function () {
'use strict';

8
app/docker/filters/utils.ts
View file

@ -9,3 +9,11 @@ export function trimSHA(imageName: string) {
}
return _.split(imageName, '@sha256')[0];
}
export function joinCommand(command: null | Array<string> = []) {
if (!command) {
return '';
}
return command.join(' ');
}

4
app/docker/react/components/index.ts
View file

@ -9,9 +9,13 @@ import { Gpu } from '@/react/docker/containers/CreateView/Gpu';
import { withCurrentUser } from '@/react-tools/withCurrentUser';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { withUIRouter } from '@/react-tools/withUIRouter';
import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails';
import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus';
export const componentsModule = angular
.module('portainer.docker.react.components', [])
.component('dockerfileDetails', r2a(DockerfileDetails, ['image']))
.component('dockerHealthStatus', r2a(HealthStatus, ['health']))
.component(
'containerQuickActions',
r2a(withUIRouter(withCurrentUser(ContainerQuickActions)), [

35
app/docker/views/containers/edit/container.html
View file

@ -162,40 +162,7 @@
</access-control-panel>
<!-- !access-control-panel -->
<div ng-if="container.State.Health" class="row">
<div class="col-lg-12 col-md-12 col-xs-12">
<rd-widget>
<rd-widget-header icon="fa-server" title-text="Container health"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<tbody>
<tr>
<td>Status</td>
<td>
<i
ng-class="
{ healthy: 'fa fa-heartbeat space-right green-icon', unhealthy: 'fa fa-heartbeat space-right red-icon', starting: 'fa fa-heartbeat space-right orange-icon' }[
container.State.Health.Status
]
"
></i>
{{ container.State.Health.Status }}
</td>
</tr>
<tr>
<td>Failure count</td>
<td>{{ container.State.Health.FailingStreak }}</td>
</tr>
<tr>
<td>Last output</td>
<td>{{ container.State.Health.Log[container.State.Health.Log.length - 1].Output }}</td>
</tr>
</tbody>
</table>
</rd-widget-body>
</rd-widget>
</div>
</div>
<docker-health-status ng-if="container.State.Health" health="container.State.Health"></docker-health-status>
<div class="row" authorization="DockerImageCreate">
<div class="col-lg-12 col-md-12 col-xs-12">

54
app/docker/views/images/edit/image.html
View file

@ -162,58 +162,8 @@
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-xs-12">
<rd-widget>
<rd-widget-header icon="list" feather-icon="true" title-text="Dockerfile details"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<tbody>
<tr>
<td>CMD</td>
<td
><code>{{ image.Command | command }}</code></td
>
</tr>
<tr ng-if="image.Entrypoint">
<td>ENTRYPOINT</td>
<td
><code>{{ image.Entrypoint | command }}</code></td
>
</tr>
<tr ng-if="image.ExposedPorts.length > 0">
<td>EXPOSE</td>
<td>
<span class="label label-default space-right" ng-repeat="port in image.ExposedPorts">
{{ port }}
</span>
</td>
</tr>
<tr ng-if="image.Volumes.length > 0">
<td>VOLUME</td>
<td>
<span class="label label-default space-right" ng-repeat="volume in image.Volumes">
{{ volume }}
</span>
</td>
</tr>
<tr ng-if="image.Env.length > 0">
<td>ENV</td>
<td>
<table class="table table-bordered table-condensed">
<tr ng-repeat="var in image.Env">
<td>{{ var|key: '=' }}</td>
<td>{{ var|value: '=' }}</td>
</tr>
</table>
</td>
</tr>
</tbody>
</table>
</rd-widget-body>
</rd-widget>
</div>
</div>
<dockerfile-details ng-if="image" image="image"></dockerfile-details>
<div class="row" ng-if="history.length > 0">
<div class="col-lg-12 col-md-12 col-xs-12">
<rd-widget>