Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d7b91fb5
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7b91fb5
编写于
5月 09, 2016
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify Container Registry view implementation
上级
08396be6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
41 addition
and
25 deletion
+41
-25
app/models/project.rb
app/models/project.rb
+6
-4
app/views/projects/container_registry/index.html.haml
app/views/projects/container_registry/index.html.haml
+21
-20
lib/container_registry/blob.rb
lib/container_registry/blob.rb
+4
-0
lib/container_registry/registry.rb
lib/container_registry/registry.rb
+2
-1
lib/container_registry/repository.rb
lib/container_registry/repository.rb
+4
-0
lib/container_registry/tag.rb
lib/container_registry/tag.rb
+4
-0
未找到文件。
app/models/project.rb
浏览文件 @
d7b91fb5
...
...
@@ -375,17 +375,19 @@ class Project < ActiveRecord::Base
@repository
||=
Repository
.
new
(
path_with_namespace
,
self
)
end
def
container_registry
def
container_registry
_repository
@container_registry_repository
||=
begin
token
=
Jwt
::
ContainerRegistryAuthenticationService
.
full_access_token
(
path_with_namespace
)
registry
=
ContainerRegistry
::
Registry
.
new
(
Gitlab
.
config
.
registry
.
api_url
,
token:
token
)
url
=
Gitlab
.
config
.
registry
.
api_url
host_port
=
Gitlab
.
config
.
registry
.
host_port
registry
=
ContainerRegistry
::
Registry
.
new
(
url
,
token:
token
,
path:
host_port
)
registry
[
path_with_namespace
]
end
end
def
container_registry_url
def
container_registry_
repository_
url
if
container_registry_enabled?
&&
Gitlab
.
config
.
registry
.
enabled
"
#{
Gitlab
.
config
.
registry
.
host_
with_
port
}
/
#{
path_with_namespace
}
"
"
#{
Gitlab
.
config
.
registry
.
host_port
}
/
#{
path_with_namespace
}
"
end
end
...
...
app/views/projects/container_registry/index.html.haml
浏览文件 @
d7b91fb5
-
page_title
"Container Registry"
=
render
"header_title"
.light.prepend-top-default
%p
A 'container image' is a snapshot of a container.
You can host your 'container images' with GitLab.
%br
To start using container images hosted on GitLab you first need to login:
%pre
%code
docker login
#{
Gitlab
.
config
.
registry
.
host_port
}
%br
Then you are free to create and upload a container images with build and push commands:
%pre
docker build -t
#{
Gitlab
.
config
.
registry
.
host_port
}
/
#{
@project
.
path_with_namespace
}
.
%br
docker push
#{
Gitlab
.
config
.
registry
.
host_port
}
/
#{
@project
.
path_with_namespace
}
%hr
%ul
.content-list
-
if
@tags
.
blank?
%li
.nothing-here-block
No images to show
.nothing-here-block
No images in Container Registry for this project.
.light.prepend-top-default
%p
A 'container image' is a snapshot of a container.
You can host your container images with GitLab.
%br
To start using container images hosted on GitLab you first need to login:
%pre
%code
docker login
#{
Gitlab
.
config
.
registry
.
host_port
}
%br
Then you are free to create and upload a container images with build and push commands:
%pre
docker build -t
#{
escape_once
(
@project
.
container_registry_repository_url
)
}
.
%br
docker push
#{
escape_once
(
@project
.
container_registry_repository_url
)
}
-
else
.table-holder
%table
.table.builds
%thead
%tr
%th
Name
%th
Digest
%th
Image ID
%th
Size
%th
Created
%th
...
...
@@ -37,8 +38,8 @@
-
@tags
.
each
do
|
tag
|
%tr
%td
#{
tag
.
repository
.
name
}
:
#{
tag
.
name
}
=
clipboard_button
(
clipboard_text:
"docker pull
#{
Gitlab
.
config
.
registry
.
host_port
}
/
#{
tag
.
repository
.
name
}
:
#{
tag
.
name
}
"
)
=
escape_once
(
tag
.
name
)
=
clipboard_button
(
clipboard_text:
"docker pull
#{
tag
.
path
}
"
)
%td
-
if
layer
=
tag
.
layers
.
first
%span
.has-tooltip
(
title=
"#{layer.revision}"
)
...
...
lib/container_registry/blob.rb
浏览文件 @
d7b91fb5
...
...
@@ -11,6 +11,10 @@ module ContainerRegistry
digest
.
present?
end
def
path
"
#{
repository
.
path
}
@
#{
digest
}
"
end
def
digest
config
[
'digest'
]
end
...
...
lib/container_registry/registry.rb
浏览文件 @
d7b91fb5
module
ContainerRegistry
class
Registry
attr_reader
:uri
,
:client
attr_reader
:uri
,
:client
,
:path
def
initialize
(
uri
,
options
=
{})
@path
=
uri
||
options
[
:path
]
@uri
=
URI
.
parse
(
uri
)
@client
=
ContainerRegistry
::
Client
.
new
(
uri
,
options
)
end
...
...
lib/container_registry/repository.rb
浏览文件 @
d7b91fb5
...
...
@@ -10,6 +10,10 @@ module ContainerRegistry
@client
||=
registry
.
client
end
def
path
[
registry
.
path
,
name
].
compact
.
join
(
'/'
)
end
def
[]
(
tag
)
ContainerRegistry
::
Tag
.
new
(
self
,
tag
)
end
...
...
lib/container_registry/tag.rb
浏览文件 @
d7b91fb5
...
...
@@ -15,6 +15,10 @@ module ContainerRegistry
@manifest
=
client
.
repository_manifest
(
repository
.
name
,
name
)
end
def
path
"
#{
repository
.
path
}
:
#{
name
}
"
end
def
[]
(
key
)
return
unless
manifest
manifest
[
key
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录