From fcfd83aabb35882c305ce51ff0f40ff5a560f982 Mon Sep 17 00:00:00 2001 From: Maho Morichika Date: Fri, 21 Jan 2022 14:15:31 -0800 Subject: [PATCH] docker-c: fix local image --- seedemu/compiler/Docker.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/seedemu/compiler/Docker.py b/seedemu/compiler/Docker.py index 7a3d93004..739a2550e 100644 --- a/seedemu/compiler/Docker.py +++ b/seedemu/compiler/Docker.py @@ -930,13 +930,6 @@ def _makeDummies(self) -> str: def _doCompile(self, emulator: Emulator): registry = emulator.getRegistry() - for (image, ) in self.__images.values(): - if image.getName() not in self._used_images or not image.isLocal(): continue - self.__services += DockerCompilerFileTemplates['local_image'].format( - imageName = image.getName(), - dirName = image.getDirName() - ) - self._groupSoftware(emulator) for ((scope, type, name), obj) in registry.getAll().items(): @@ -979,9 +972,18 @@ def _doCompile(self, emulator: Emulator): ethClientPort = self.__eth_client_port, ) + local_images = '' + + for (image, _) in self.__images.values(): + if image.getName() not in self._used_images or not image.isLocal(): continue + local_images += DockerCompilerFileTemplates['local_image'].format( + imageName = image.getName(), + dirName = image.getDirName() + ) + self._log('creating docker-compose.yml...'.format(scope, name)) print(DockerCompilerFileTemplates['compose'].format( services = self.__services, networks = self.__networks, - dummies = self._makeDummies() + dummies = local_images + self._makeDummies() ), file=open('docker-compose.yml', 'w'))