mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 12:46:07 +10:00
Merge branch 'show-image-id-on-registry-page' into 'master'
Show proper image ID on registry page ## What does this MR do? Display the container registry image ID (from the config blob) instead of the first image layer ID ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To show proper image ID on container_registry page. This only supports manifest V2, since the manifest V1 doesn't expose information about Image ID. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18159. ## Screenshots (if relevant)  - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4821
This commit is contained in:
committed by
Robert Speicher
parent
f86308c1dc
commit
421b5aafbc
@@ -21,6 +21,7 @@ v 8.9.0 (unreleased)
|
||||
- Fix wiki page events' webhook to point to the wiki repository
|
||||
- Add a border around images to differentiate them from the background.
|
||||
- Don't show tags for revert and cherry-pick operations
|
||||
- Show image ID on registry page
|
||||
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
|
||||
- Allow customisable text on the 'nearly there' page after a user signs up
|
||||
- Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
= escape_once(tag.name)
|
||||
= clipboard_button(clipboard_text: "docker pull #{tag.path}")
|
||||
%td
|
||||
- if layer = tag.layers.first
|
||||
%span.has-tooltip{ title: "#{layer.revision}" }
|
||||
= layer.short_revision
|
||||
- if tag.revision
|
||||
%span.has-tooltip{ title: "#{tag.revision}" }
|
||||
= tag.short_revision
|
||||
- else
|
||||
\-
|
||||
%td
|
||||
|
||||
@@ -3,6 +3,7 @@ module ContainerRegistry
|
||||
attr_reader :repository, :name
|
||||
|
||||
delegate :registry, :client, to: :repository
|
||||
delegate :revision, :short_revision, to: :config_blob, allow_nil: true
|
||||
|
||||
def initialize(repository, name)
|
||||
@repository, @name = repository, name
|
||||
|
||||
@@ -26,7 +26,8 @@ describe "Container Registry" do
|
||||
end
|
||||
|
||||
context 'when there are tags' do
|
||||
it { expect(page).to have_content(tag_name)}
|
||||
it { expect(page).to have_content(tag_name) }
|
||||
it { expect(page).to have_content('d7a513a66') }
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+16
-1
@@ -1 +1,16 @@
|
||||
{"schemaVersion":2,"mediaType":"application/vnd.docker.distribution.manifest.v2+json","config":{"mediaType":"application/octet-stream","size":1145,"digest":"sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac"},"layers":[{"mediaType":"application/vnd.docker.image.rootfs.diff.tar.gzip","size":2319870,"digest":"sha256:420890c9e918b6668faaedd9000e220190f2493b0693ee563ebd7b4cc754a57d"}]}
|
||||
{
|
||||
"schemaVersion": 2,
|
||||
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
|
||||
"config": {
|
||||
"mediaType": "application/octet-stream",
|
||||
"size": 1145,
|
||||
"digest": "sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac"
|
||||
},
|
||||
"layers": [
|
||||
{
|
||||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
|
||||
"size": 2319870,
|
||||
"digest": "sha256:420890c9e918b6668faaedd9000e220190f2493b0693ee563ebd7b4cc754a57d"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user