Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
D
docker-py
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
docker-py
Commits
e75a03fd
Kaydet (Commit)
e75a03fd
authored
Ock 12, 2018
tarafından
Viktor Adam
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix regression on API < 1.25
Signed-off-by:
Viktor Adam
<
rycus86@gmail.com
>
üst
bf5e7702
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
1 deletion
+32
-1
service.py
docker/api/service.py
+8
-1
models_services_test.py
tests/integration/models_services_test.py
+24
-0
No files found.
docker/api/service.py
Dosyayı görüntüle @
e75a03fd
...
...
@@ -137,6 +137,8 @@ class ServiceApiMixin(object):
auth_header
=
auth
.
get_config_header
(
self
,
registry
)
if
auth_header
:
headers
[
'X-Registry-Auth'
]
=
auth_header
if
utils
.
version_lt
(
self
.
_version
,
'1.25'
):
networks
=
networks
or
task_template
.
pop
(
'Networks'
,
None
)
data
=
{
'Name'
:
name
,
'Labels'
:
labels
,
...
...
@@ -411,7 +413,12 @@ class ServiceApiMixin(object):
if
networks
is
not
None
:
converted_networks
=
utils
.
convert_service_networks
(
networks
)
data
[
'TaskTemplate'
][
'Networks'
]
=
converted_networks
if
utils
.
version_lt
(
self
.
_version
,
'1.25'
):
data
[
'Networks'
]
=
converted_networks
else
:
data
[
'TaskTemplate'
][
'Networks'
]
=
converted_networks
elif
utils
.
version_lt
(
self
.
_version
,
'1.25'
):
data
[
'Networks'
]
=
current
.
get
(
'Networks'
)
elif
data
[
'TaskTemplate'
]
.
get
(
'Networks'
)
is
None
:
current_task_template
=
current
.
get
(
'TaskTemplate'
,
{})
current_networks
=
current_task_template
.
get
(
'Networks'
)
...
...
tests/integration/models_services_test.py
Dosyayı görüntüle @
e75a03fd
...
...
@@ -179,6 +179,30 @@ class ServiceTest(unittest.TestCase):
service
.
reload
()
assert
not
service
.
attrs
[
'Spec'
]
.
get
(
'Labels'
)
def
test_update_retains_networks
(
self
):
client
=
docker
.
from_env
(
version
=
TEST_API_VERSION
)
network_name
=
helpers
.
random_name
()
network
=
client
.
networks
.
create
(
network_name
,
driver
=
'overlay'
)
service
=
client
.
services
.
create
(
# create arguments
name
=
helpers
.
random_name
(),
networks
=
[
network
.
id
],
# ContainerSpec arguments
image
=
"alpine"
,
command
=
"sleep 300"
)
service
.
update
(
# create argument
name
=
service
.
name
,
# ContainerSpec argument
command
=
"sleep 600"
)
service
.
reload
()
networks
=
service
.
attrs
[
'Spec'
][
'TaskTemplate'
][
'Networks'
]
assert
networks
==
[{
'Target'
:
network
.
id
}]
def
test_scale_service
(
self
):
client
=
docker
.
from_env
(
version
=
TEST_API_VERSION
)
service
=
client
.
services
.
create
(
...
...
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