Skip to content

Fix848/dyn services dont start in prod #849

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.

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

Merged
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7e0ec29
fixed director in devel mode
sanderegg Mar 26, 2019
d88bd08
Merge remote-tracking branch 'upstream/master'
sanderegg Mar 28, 2019
994a94f
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 3, 2019
ac98a02
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 4, 2019
6d02a21
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 4, 2019
0714adc
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 8, 2019
9fa3e08
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 9, 2019
b7f9841
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 11, 2019
1875de4
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 17, 2019
56905cd
Merge branch 'master' of github.com:sanderegg/osparc-simcore
sanderegg Apr 17, 2019
8ff7d7b
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 25, 2019
d10d145
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 26, 2019
d754888
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 27, 2019
6f0ca7c
Merge remote-tracking branch 'upstream/master'
sanderegg Apr 30, 2019
6858aa3
Merge remote-tracking branch 'upstream/master'
sanderegg May 7, 2019
1af7230
Merge remote-tracking branch 'upstream/master'
sanderegg May 9, 2019
2a2e569
Merge remote-tracking branch 'upstream/master'
sanderegg May 9, 2019
5c6baae
Merge remote-tracking branch 'upstream/master'
sanderegg May 13, 2019
5694dd6
Merge branch 'master' of github.com:sanderegg/osparc-simcore
sanderegg May 13, 2019
aef0ab8
Merge remote-tracking branch 'upstream/master'
sanderegg May 14, 2019
09f493b
Merge remote-tracking branch 'upstream/master'
sanderegg May 16, 2019
b962e02
Merge remote-tracking branch 'upstream/master'
sanderegg May 20, 2019
1bfdcac
Merge remote-tracking branch 'upstream/master'
sanderegg May 22, 2019
19c011e
Merge remote-tracking branch 'upstream/master'
sanderegg May 22, 2019
54be55a
Merge remote-tracking branch 'upstream/master'
sanderegg May 22, 2019
dbbfb51
Merge remote-tracking branch 'upstream/master'
sanderegg May 22, 2019
ae7b917
Merge remote-tracking branch 'upstream/master'
sanderegg May 23, 2019
bd615d7
Merge branch 'master' of github.com:sanderegg/osparc-simcore
sanderegg May 23, 2019
df67864
Merge remote-tracking branch 'upstream/master'
sanderegg May 27, 2019
c073735
Merge remote-tracking branch 'upstream/master'
sanderegg May 27, 2019
94a727e
Merge branch 'master' of github.com:sanderegg/osparc-simcore
sanderegg May 27, 2019
c8d94e8
Merge remote-tracking branch 'upstream/master'
sanderegg May 28, 2019
018edc1
Merge remote-tracking branch 'upstream/master'
sanderegg May 29, 2019
1ce6f4c
Merge remote-tracking branch 'upstream/master'
sanderegg Jun 4, 2019
a766f25
Merge remote-tracking branch 'upstream/master'
sanderegg Jun 4, 2019
f8ea2f8
Merge remote-tracking branch 'upstream/master'
sanderegg Jun 4, 2019
105bedc
Merge remote-tracking branch 'upstream/master'
sanderegg Jun 5, 2019
aa52bd1
find network using full network name
sanderegg Jun 6, 2019
d9987d4
Merge branch 'master' into fix848/dyn_services_dont_start_in_prod
pcrespov Jun 6, 2019
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
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ async def _get_service_entrypoint(service_boot_parameters_labels: Dict) -> str:
async def _get_swarm_network(client: aiodocker.docker.Docker) -> Dict:
network_name = "_default"
if config.SWARM_STACK_NAME:
network_name = config.SWARM_STACK_NAME
network_name = "{}_default".format(config.SWARM_STACK_NAME)
# try to find the network name (usually named STACKNAME_default)
networks = [x for x in (await client.networks.list()) if "swarm" in x["Scope"] and network_name in x["Name"]]
if not networks or len(networks) > 1:
Expand Down