From c7b0cf78fa2a9dbd80d76a5ade10a2db2bd1eff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Mon, 1 May 2023 12:09:16 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20test:=20level=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/options/generate/generator.py | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/options/generate/generator.py b/src/options/generate/generator.py index 4174ce7..37eb171 100644 --- a/src/options/generate/generator.py +++ b/src/options/generate/generator.py @@ -187,24 +187,26 @@ metas: tag_name=REQUIREMENTS_FILE_TAG, )[REQUIREMENTS_FILE_NAME] - self.generate_and_persist_file( - section_title='Generate Dockerfile', - template=template_generate_apt_get_install, - destination_folder=MICROSERVICE_FOLDER_v1, - file_name_s=None, - parse_result_fn=self.parse_result_fn_dockerfile, - docker_file_wrapped=self.read_docker_template(), - requirements_file_wrapped=self.files_to_string({ - REQUIREMENTS_FILE_NAME: requirements_content, - }) - ) - - # # docker file from curdir - # shutil.copy( - # src=os.path.join(os.path.dirname(__file__), 'static_files', 'microservice', 'Dockerfile'), - # dst=MICROSERVICE_FOLDER_v1 + '/Dockerfile' + # self.generate_and_persist_file( + # section_title='Generate Dockerfile', + # template=template_generate_apt_get_install, + # destination_folder=MICROSERVICE_FOLDER_v1, + # file_name_s=None, + # parse_result_fn=self.parse_result_fn_dockerfile, + # docker_file_wrapped=self.read_docker_template(), + # requirements_file_wrapped=self.files_to_string({ + # REQUIREMENTS_FILE_NAME: requirements_content, + # }) # ) + + with open(os.path.join(os.path.dirname(__file__), 'static_files', 'microservice', 'Dockerfile'), 'r', encoding='utf-8') as f: + docker_file_template_lines = f.readlines() + docker_file_template_lines = [line for line in docker_file_template_lines if not line.startswith('RUN apt-get update')] + docker_file_content = '\n'.join(docker_file_template_lines) + persist_file(docker_file_content, os.path.join(MICROSERVICE_FOLDER_v1, 'Dockerfile')) + + self.write_config_yml(microservice_name, MICROSERVICE_FOLDER_v1) print('\nFirst version of the microservice generated. Start iterating on it to make the tests pass...')