Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
main
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Simone Rossi
main
Commits
fa5030ab
Commit
fa5030ab
authored
Apr 27, 2018
by
Daniele Venzano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix labels in ZApp manifests
parent
be064a91
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
zoe_api/web/zapp_shop.py
zoe_api/web/zapp_shop.py
+6
-2
zoe_master/backends/common.py
zoe_master/backends/common.py
+3
-4
zoe_master/backends/docker/threads.py
zoe_master/backends/docker/threads.py
+3
-2
No files found.
zoe_api/web/zapp_shop.py
View file @
fa5030ab
...
...
@@ -96,8 +96,12 @@ class ZAppStartWeb(ZoeWebRequestHandler):
exec_name
=
self
.
get_argument
(
'exec_name'
)
app_descr
=
self
.
_set_parameters
(
zapp
.
zoe_description
,
zapp
.
parameters
,
self
.
current_user
.
role
)
for
service
in
app_descr
[
'services'
]:
service
.
labels
.
append
(
zapp
.
labels
)
if
len
(
zapp
.
labels
)
>
0
:
for
service
in
app_descr
[
'services'
]:
if
'labels'
in
service
:
service
[
'labels'
].
append
(
zapp
.
labels
)
else
:
service
[
'labels'
]
=
zapp
.
labels
try
:
self
.
get_argument
(
'download_json'
)
...
...
zoe_master/backends/common.py
View file @
fa5030ab
...
...
@@ -39,14 +39,13 @@ def gen_environment(execution: Execution, service: Service, env_subst_dict: Dict
env_list
.
append
((
'EXECUTION_ID'
,
str
(
execution
.
id
)))
env_list
.
append
((
'DEPLOY_NAME'
,
get_conf
().
deployment_name
))
env_list
.
append
((
'UID'
,
execution
.
owner
.
fs_uid
))
env_list
.
append
((
'GID'
,
get_conf
().
fs_group_id
))
env_list
.
append
((
'USER'
,
execution
.
owner
.
username
))
env_list
.
append
((
'
ZOE_
UID'
,
execution
.
owner
.
fs_uid
))
env_list
.
append
((
'
ZOE_
GID'
,
get_conf
().
fs_group_id
))
env_list
.
append
((
'
ZOE_
USER'
,
execution
.
owner
.
username
))
env_list
.
append
((
'SERVICE_NAME'
,
service
.
name
))
wk_vol
=
ZoeFSWorkspace
().
get
(
execution
.
owner
)
env_list
.
append
((
'ZOE_WORKSPACE'
,
wk_vol
.
mount_point
))
env_list
.
append
((
'HOME'
,
wk_vol
.
mount_point
))
return
env_list
...
...
zoe_master/backends/docker/threads.py
View file @
fa5030ab
...
...
@@ -106,7 +106,7 @@ class DockerStateSynchronizer(threading.Thread):
}
self
.
host_stats
[
host_config
.
name
].
service_stats
=
stats
self
.
host_stats
[
host_config
.
name
].
images
=
[]
tmp_
images
=
[]
for
dk_image
in
my_engine
.
list_images
():
image
=
{
'id'
:
dk_image
.
attrs
[
'Id'
],
...
...
@@ -117,7 +117,8 @@ class DockerStateSynchronizer(threading.Thread):
if
name
[
-
7
:]
==
':latest'
:
# add an image with the name without 'latest' to fake Docker image lookup algorithm
image
[
'names'
].
append
(
name
[:
-
7
])
break
self
.
host_stats
[
host_config
.
name
].
images
.
append
(
image
)
tmp_images
.
append
(
image
)
self
.
host_stats
[
host_config
.
name
].
images
=
tmp_images
sleep_time
=
CHECK_INTERVAL
-
(
time
.
time
()
-
time_start
)
if
sleep_time
<=
0
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment