Skip to content

Fix unable to find images for node creation #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dodo920306 wants to merge 1 commit into from
+13 −13
Closed

Fix unable to find images for node creation #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/agent/docker-rest-agent/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ def get_network():
containers = {}
for container in container_list:
containers[container.id]={
"id":container.id,
"short_id":container.short_id,
"name":container.name,
"status":container.status,
"image":str(container.image),
"attrs":container.attrs
"id":container.id,
"short_id":container.short_id,
"name":container.name,
"status":container.status,
"image":str(container.image),
"attrs":container.attrs
}
res = {'code':PASS_CODE, 'data':containers, 'msg':''}
return jsonify({'res':res})
Expand All @@ -37,11 +37,11 @@ def get_network():
def create_node():
node_name = request.form.get('name')
env = {
'HLF_NODE_MSP': request.form.get('msp'),
'HLF_NODE_TLS':request.form.get('tls'),
'HLF_NODE_PEER_CONFIG':request.form.get('peer_config_file'),
'HLF_NODE_ORDERER_CONFIG':request.form.get('orderer_config_file'),
'platform': 'linux/amd64',
'HLF_NODE_MSP': request.form.get('msp'),
'HLF_NODE_TLS':request.form.get('tls'),
'HLF_NODE_PEER_CONFIG':request.form.get('peer_config_file'),
'HLF_NODE_ORDERER_CONFIG':request.form.get('orderer_config_file'),
'platform': 'linux/amd64',
}
port_map = ast.literal_eval(request.form.get("port_map"))
volumes = [
Expand Down Expand Up @@ -113,7 +113,7 @@ def create_node():
volumes=volumes,
environment=env,
ports=port_map
)
)
except:
res['code'] = FAIL_CODE
res['data'] = sys.exc_info()[0]
Expand Down
2 changes: 1 addition & 1 deletion src/api-engine/api/lib/agent/docker/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def create(self, info):
'tls': info.get("tls")[2:-1],
'peer_config_file': info.get("config_file")[2:-1],
'orderer_config_file': info.get("config_file")[2:-1],
'img': 'hyperledger/fabric:2.5.10',
'img': 'hyperledger/fabric-peer:2.5.10' if info.get("type") == "peer" else 'hyperledger/fabric-orderer:2.5.10',
'cmd': 'bash /tmp/init.sh "peer node start"' if info.get("type") == "peer" else 'bash /tmp/init.sh "orderer"',
'name': info.get("name"),
'type': info.get("type"),
Expand Down
Loading