Skip to content

Commit 790770a

Browse files
authored
Fix empty container layer history and UI (#21251) (#21278)
Backport of #21251
1 parent 43b4c38 commit 790770a

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

Diff for: modules/packages/container/metadata.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ func parseOCIImageConfig(r io.Reader) (*Metadata, error) {
9595
if i := strings.Index(cmd, "#(nop) "); i != -1 {
9696
cmd = strings.TrimSpace(cmd[i+7:])
9797
}
98-
imageLayers = append(imageLayers, cmd)
98+
if cmd != "" {
99+
imageLayers = append(imageLayers, cmd)
100+
}
99101
}
100102

101103
metadata := &Metadata{

Diff for: templates/package/content/container.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{{if .PackageDescriptor.Metadata.ImageLayers}}
4444
<h4 class="ui top attached header">{{.i18n.Tr "packages.container.layers"}}</h4>
4545
<div class="ui attached segment">
46-
<table id="notice-table" class="ui very basic compact table">
46+
<table class="ui very basic compact table">
4747
<tbody>
4848
{{range .PackageDescriptor.Metadata.ImageLayers}}
4949
<tr>
@@ -57,7 +57,7 @@
5757
{{if .PackageDescriptor.Metadata.Labels}}
5858
<h4 class="ui top attached header">{{.i18n.Tr "packages.container.labels"}}</h4>
5959
<div class="ui attached segment">
60-
<table id="notice-table" class="ui very basic compact table">
60+
<table class="ui very basic compact table container-labels">
6161
<thead>
6262
<tr>
6363
<th>{{.i18n.Tr "packages.container.labels.key"}}</th>

Diff for: web_src/less/_package.less

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.container-labels {
2+
td:nth-child(1) {
3+
vertical-align: top;
4+
}
5+
6+
td:nth-child(2) {
7+
overflow-wrap: anywhere;
8+
}
9+
}

Diff for: web_src/less/index.less

+1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
@import "_admin";
3535
@import "_explore";
3636
@import "_review";
37+
@import "_package";
3738

3839
@import "./helpers.less";

0 commit comments

Comments
 (0)