diff options
author | KN4CK3R <admin@oldschoolhack.me> | 2022-09-27 15:03:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-27 15:03:24 +0200 |
commit | 904b324716933561028205b23ac10088f108a6de (patch) | |
tree | 2149e886e8305699717e6c43aa31bf3f740f3d6a | |
parent | 31f934c1d8005cdd87c47ce104d00c0efaec374b (diff) | |
download | gitea-904b324716933561028205b23ac10088f108a6de.tar.gz gitea-904b324716933561028205b23ac10088f108a6de.zip |
Fix empty container layer history and UI (#21251)
Fixes #21248
-rw-r--r-- | modules/packages/container/metadata.go | 4 | ||||
-rw-r--r-- | templates/package/content/container.tmpl | 4 | ||||
-rw-r--r-- | web_src/less/_package.less | 9 | ||||
-rw-r--r-- | web_src/less/index.less | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go index 4222cdb30a..fd38e67859 100644 --- a/modules/packages/container/metadata.go +++ b/modules/packages/container/metadata.go @@ -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{ diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index 939dfe4020..a79963e732 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -47,7 +47,7 @@ {{if .PackageDescriptor.Metadata.ImageLayers}} <h4 class="ui top attached header">{{.locale.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> @@ -61,7 +61,7 @@ {{if .PackageDescriptor.Metadata.Labels}} <h4 class="ui top attached header">{{.locale.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>{{.locale.Tr "packages.container.labels.key"}}</th> diff --git a/web_src/less/_package.less b/web_src/less/_package.less new file mode 100644 index 0000000000..f4a07a1889 --- /dev/null +++ b/web_src/less/_package.less @@ -0,0 +1,9 @@ +.container-labels { + td:nth-child(1) { + vertical-align: top; + } + + td:nth-child(2) { + overflow-wrap: anywhere; + } +} diff --git a/web_src/less/index.less b/web_src/less/index.less index 4823c56173..2d670ac2d5 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -35,5 +35,6 @@ @import "_admin"; @import "_explore"; @import "_review"; +@import "_package"; @import "./helpers.less"; |