Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
95e2c019
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,发现更多精彩内容 >>
提交
95e2c019
编写于
3月 22, 2017
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean code related to accessing registry from project
[ci skip]
上级
29c34267
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
35 deletion
+9
-35
app/models/container_image.rb
app/models/container_image.rb
+4
-24
app/models/project.rb
app/models/project.rb
+5
-11
未找到文件。
app/models/container_image.rb
浏览文件 @
95e2c019
...
...
@@ -3,36 +3,16 @@ class ContainerImage < ActiveRecord::Base
belongs_to
:project
delegate
:container_registry
,
:container_registry_allowed_paths
,
:container_registry_path_with_namespace
,
to: :project
delegate
:container_registry
,
to: :project
delegate
:client
,
to: :container_registry
validates
:manifest
,
presence:
true
before_destroy
:delete_tags
before_validation
:update_token
,
on: :create
def
update_token
paths
=
container_registry_allowed_paths
<<
name_with_namespace
token
=
Auth
::
ContainerRegistryAuthenticationService
.
full_access_token
(
paths
)
client
.
update_token
(
token
)
end
def
parent
project
end
def
parent_changed?
project_id_changed?
end
# def path
# [container_registry.path, name_with_namespace].compact.join('/')
# end
def
name_with_namespace
[
container_registry_path_with_namespace
,
name
].
reject
(
&
:blank?
).
join
(
'/'
)
def
registry
# TODO, container registry with image access level
token
=
Auth
::
ContainerRegistryAuthenticationService
.
image_token
(
self
)
end
def
tag
(
tag
)
...
...
app/models/project.rb
浏览文件 @
95e2c019
...
...
@@ -405,29 +405,23 @@ class Project < ActiveRecord::Base
@repository
||=
Repository
.
new
(
path_with_namespace
,
self
)
end
def
container_registry_path_with_namespace
path_with_namespace
.
downcase
end
def
container_registry_allowed_paths
@container_registry_allowed_paths
||=
[
container_registry_path_with_namespace
]
+
container_images
.
map
{
|
i
|
i
.
name_with_namespace
}
end
def
container_registry
return
unless
Gitlab
.
config
.
registry
.
enabled
@container_registry
||=
begin
token
=
Auth
::
ContainerRegistryAuthenticationService
.
full_access_token
(
container_registry_allowed_paths
)
token
=
Auth
::
ContainerRegistryAuthenticationService
.
full_access_token
(
project
)
url
=
Gitlab
.
config
.
registry
.
api_url
host_port
=
Gitlab
.
config
.
registry
.
host_port
# TODO, move configuration vars into ContainerRegistry::Registry, clean
# this method up afterwards
ContainerRegistry
::
Registry
.
new
(
url
,
token:
token
,
path:
host_port
)
end
end
def
container_registry_url
if
Gitlab
.
config
.
registry
.
enabled
"
#{
Gitlab
.
config
.
registry
.
host_port
}
/
#{
container_registry_path_with_namespac
e
}
"
"
#{
Gitlab
.
config
.
registry
.
host_port
}
/
#{
path_with_namespace
.
downcas
e
}
"
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录