Skip to content

Commit 880efab

Browse files
committed
update docker version in requirements, update configparser logic, fix SocketIO error
Change-Id: I73f2c7aad33091addf2d54cee0ae1eceac3d86a1
1 parent cd0ccef commit 880efab

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/nodemgr/common/docker_containers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ def execute(self, id_, line_):
2525
try:
2626
# string or stream result works unstable
2727
# using socket with own read implementation
28-
socket = self._client.exec_start(exec_op["Id"], tty=True, socket=True)
28+
socket = self._client.exec_start(exec_op["Id"], tty=True, socket=True)._sock
2929
socket.settimeout(10.0)
3030
while True:
3131
part = socket.recv(1024)
3232
if len(part) == 0:
3333
break
34-
res += part
34+
res += str(part)
3535
finally:
3636
if socket:
3737
# There is cyclic reference there

src/nodemgr/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from gevent import monkey
1515

1616
import argparse
17-
from six.moves.configparser import SafeConfigParser, NoOptionError
17+
from configparser import SafeConfigParser, NoOptionError
1818
import gevent
1919
import os
2020
import socket
@@ -164,7 +164,7 @@ def main(args_str=' '.join(sys.argv[1:])):
164164
if (os.path.exists(config_file_path) is False):
165165
sys.stderr.write("config file '" + config_file_path + "' is not present\n")
166166
sys.exit(1)
167-
config = SafeConfigParser()
167+
config = SafeConfigParser(strict=False)
168168
config.read([config_file_path])
169169
if 'DEFAULTS' in config.sections():
170170
default.update(dict(config.items('DEFAULTS')))

src/nodemgr/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ sandesh==0.1dev
88
sandesh-common
99
grpcio==1.29.0
1010
protobuf==3.17.3
11-
docker<3.0.0
11+
docker<=3.0.0
1212
containerd==1.5.2

0 commit comments

Comments
 (0)