Merge pull request #6577 from heww/master

Include os version in image tag detail page
This commit is contained in:
He Weiwei 2018-12-20 18:18:44 +08:00 committed by GitHub
commit f403e50234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 15 additions and 0 deletions

View File

@ -82,6 +82,7 @@ type tagDetail struct {
Size int64 `json:"size"`
Architecture string `json:"architecture"`
OS string `json:"os"`
OSVersion string `json:"os.version"`
DockerVersion string `json:"docker_version"`
Author string `json:"author"`
Created time.Time `json:"created"`

View File

@ -93,6 +93,7 @@ describe('RepositoryComponent (inline template)', () => {
'size': '2049',
'architecture': 'amd64',
'os': 'linux',
'os.version': '',
'docker_version': '1.12.3',
'author': 'NGINX Docker Maintainers \"docker-maint@nginx.com\"',
'created': new Date('2016-11-08T22:41:15.912313785Z'),

View File

@ -55,6 +55,7 @@ export interface Tag extends Base {
size: string;
architecture: string;
os: string;
'os.version': string;
docker_version: string;
author: string;
created: Date;

View File

@ -24,6 +24,10 @@
<label class="detail-label">{{'TAG.OS' | translate }}</label>
<div class="image-details" [title]="tagDetails.os">{{tagDetails.os}}</div>
</section>
<section class="detail-row">
<label class="detail-label">{{'TAG.OS_VERSION' | translate }}</label>
<div class="image-details" [title]="tagDetails['os.version']">{{tagDetails['os.version']}}</div>
</section>
<section class="detail-row">
<label class="detail-label">{{'TAG.DOCKER_VERSION' | translate }}</label>
<div class="image-details" [title]="tagDetails.docker_version">{{tagDetails.docker_version}}</div>

View File

@ -71,6 +71,7 @@ describe("TagDetailComponent (inline template)", () => {
size: "2049",
architecture: "amd64",
os: "linux",
'os.version': "",
docker_version: "1.12.3",
author: "steven",
created: new Date("2016-11-08T22:41:15.912313785Z"),

View File

@ -41,6 +41,7 @@ export class TagDetailComponent implements OnInit {
created: new Date(),
architecture: "--",
os: "--",
'os.version': "--",
docker_version: "--",
digest: "--",
labels: []

View File

@ -37,6 +37,7 @@ describe("TagComponent (inline template)", () => {
"size": "2049",
"architecture": "amd64",
"os": "linux",
"os.version": "",
"docker_version": "1.12.3",
"author": "NGINX Docker Maintainers \"docker-maint@nginx.com\"",
"created": new Date("2016-11-08T22:41:15.912313785Z"),

View File

@ -753,6 +753,7 @@
"DOCKER_VERSION": "Docker Version",
"ARCHITECTURE": "Architecture",
"OS": "OS",
"OS_VERSION": "OS Version",
"HAVE": "have",
"HAS": "has",
"SCAN_COMPLETION_TIME": "Scan Completed",

View File

@ -752,6 +752,7 @@
"DOCKER_VERSION": "Docker Version",
"ARCHITECTURE": "Architecture",
"OS": "OS",
"OS_VERSION": "OS Version",
"HAVE": "have",
"HAS": "has",
"SCAN_COMPLETION_TIME": "Scan Completed",

View File

@ -717,6 +717,7 @@
"DOCKER_VERSION": "Version de Docker",
"ARCHITECTURE": "Architecture",
"OS": "OS",
"OS_VERSION": "Version de OS",
"HAVE": "have",
"HAS": "has",
"SCAN_COMPLETION_TIME": "Analyse Terminée",

View File

@ -455,6 +455,7 @@
"DOCKER_VERSION": "Versão do Docker",
"ARCHITECTURE": "Arquitetura",
"OS": "SO",
"OS_VERSION": "Versão do SO",
"SHOW_DETAILS": "Exibir detalhes",
"REPOSITORIES": "Repositórios",
"OF": "de",

View File

@ -751,6 +751,7 @@
"DOCKER_VERSION": "Docker版本",
"ARCHITECTURE": "架构",
"OS": "操作系统",
"OS_VERSION": "操作系统版本",
"HAVE": "存在",
"HAS": "存在",
"SCAN_COMPLETION_TIME": "扫描完成时间",