Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: OCI仓库支持多架构镜像，前端相关改造 #1689 #1726

Merged
merged 3 commits into from
Jan 30, 2024
Merged

feat: OCI仓库支持多架构镜像，前端相关改造 #1689 #1726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ecf352
feat: oci 仓库版本详情页基本信息中添加OS/ARCH字段展示 #1689
gujunling Jan 26, 2024
df89ff5
feat: oci仓库使用指引修改，支持拉取多架构镜像 #1689
gujunling Jan 26, 2024
84a3b61
Merge branch 'master' of https://github.com/gujunling/bk-repo into is…
gujunling Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/frontend/devops-repository/src/views/repoCommon/commonVersionDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<span v-if="detail.basic.groupId" class="ml5 repo-tag"> {{ detail.basic.groupId }} </span>
</span>
</div>
<div v-if="detail.basic.platform" class="package-platform grid-item">
<label>OS/ARCH</label>
<span class="flex-1 text-overflow" :title="detail.basic.platform.join()">{{ detail.basic.platform.join() }}</span>
</div>
<div class="grid-item"
v-for="{ name, label, value } in detailInfoMap"
:key="name">
Expand Down Expand Up @@ -335,6 +339,7 @@
}
}
.package-name,
.package-platform,
.package-description {
grid-column: 1 / 3;
}
Expand Down
6 changes: 5 additions & 1 deletion src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ export default {
userName () {
return this.userInfo.username || '<USERNAME>'
},
// docker manifest 需要修改版本之前的分隔符，带有sha256:的使用@符号，其他的使用:
dockerSeparator () {
return this.versionLabel.includes('sha256:') ? '@' : ':'
},
dockerGuide () {
return [
{
Expand Down Expand Up @@ -74,7 +78,7 @@ export default {
{
subTitle: this.$t('useSubTips'),
codeList: [
`docker pull ${this.domain.docker}/${this.projectId}/${this.repoName}/${this.packageName}:${this.versionLabel}`
`docker pull ${this.domain.docker}/${this.projectId}/${this.repoName}/${this.packageName}${this.dockerSeparator}${this.versionLabel}`
]
}
]
Expand Down
Loading