Browse Source

Fix empty container layer history and UI (#21251) (#21278)

Backport of #21251
tags/v1.17.3
KN4CK3R 1 year ago
parent
commit
790770aef3
No account linked to committer's email address

+ 3
- 1
modules/packages/container/metadata.go View File

@@ -95,7 +95,9 @@ func parseOCIImageConfig(r io.Reader) (*Metadata, error) {
if i := strings.Index(cmd, "#(nop) "); i != -1 {
cmd = strings.TrimSpace(cmd[i+7:])
}
imageLayers = append(imageLayers, cmd)
if cmd != "" {
imageLayers = append(imageLayers, cmd)
}
}

metadata := &Metadata{

+ 2
- 2
templates/package/content/container.tmpl View File

@@ -43,7 +43,7 @@
{{if .PackageDescriptor.Metadata.ImageLayers}}
<h4 class="ui top attached header">{{.i18n.Tr "packages.container.layers"}}</h4>
<div class="ui attached segment">
<table id="notice-table" class="ui very basic compact table">
<table class="ui very basic compact table">
<tbody>
{{range .PackageDescriptor.Metadata.ImageLayers}}
<tr>
@@ -57,7 +57,7 @@
{{if .PackageDescriptor.Metadata.Labels}}
<h4 class="ui top attached header">{{.i18n.Tr "packages.container.labels"}}</h4>
<div class="ui attached segment">
<table id="notice-table" class="ui very basic compact table">
<table class="ui very basic compact table container-labels">
<thead>
<tr>
<th>{{.i18n.Tr "packages.container.labels.key"}}</th>

+ 9
- 0
web_src/less/_package.less View File

@@ -0,0 +1,9 @@
.container-labels {
td:nth-child(1) {
vertical-align: top;
}

td:nth-child(2) {
overflow-wrap: anywhere;
}
}

+ 1
- 0
web_src/less/index.less View File

@@ -34,5 +34,6 @@
@import "_admin";
@import "_explore";
@import "_review";
@import "_package";

@import "./helpers.less";

Loading…
Cancel
Save