From 349fa7719e13a2ca7748262939ef7ade65fac2d9 Mon Sep 17 00:00:00 2001 From: Volodymyr Krytskyi Date: Mon, 28 Nov 2022 16:07:44 +0200 Subject: [PATCH 1/3] Added gp3 volume type --- spotty/providers/aws/config/validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spotty/providers/aws/config/validation.py b/spotty/providers/aws/config/validation.py index 5b3eb2b..c709861 100644 --- a/spotty/providers/aws/config/validation.py +++ b/spotty/providers/aws/config/validation.py @@ -70,7 +70,7 @@ def validate_ebs_volume_parameters(params: dict): ), Optional('size', default=0): And(int, lambda x: x > 0), # TODO: add the "iops" parameter to support the "io1" EBS volume type - Optional('type', default='gp2'): lambda x: x in ['gp2', 'sc1', 'st1', 'standard'], + Optional('type', default='gp2'): lambda x: x in ['gp3', 'gp2', 'sc1', 'st1', 'standard'], Optional('deletionPolicy', default=EbsVolume.DP_RETAIN): And( str, lambda x: x in [EbsVolume.DP_CREATE_SNAPSHOT, From 05f756883bd046271f931ff4fc91bb5d4193973d Mon Sep 17 00:00:00 2001 From: Volodymyr Krytskyi Date: Tue, 29 Nov 2022 00:24:31 +0200 Subject: [PATCH 2/3] Enabled buildkit --- spotty/deployment/container/docker/docker_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spotty/deployment/container/docker/docker_commands.py b/spotty/deployment/container/docker/docker_commands.py index 2dcbbec..24a7d5c 100644 --- a/spotty/deployment/container/docker/docker_commands.py +++ b/spotty/deployment/container/docker/docker_commands.py @@ -12,7 +12,7 @@ def build(self, image_name: str) -> str: if not self._instance_config.docker_context_path: raise ValueError('Cannot generate the "build" command as Docker context path is not set') - build_cmd = 'docker build -t %s -f %s %s' % (image_name, shlex.quote(self._instance_config.dockerfile_path), + build_cmd = 'DOCKER_BUILDKIT=1 docker build -t %s -f %s %s' % (image_name, shlex.quote(self._instance_config.dockerfile_path), shlex.quote(self._instance_config.docker_context_path)) if self._instance_config.container_config.run_as_host_user: From 0e6f85601fecc4ca15d7aab8af0c0afc967edd45 Mon Sep 17 00:00:00 2001 From: Volodymyr Krytskyi Date: Tue, 6 Dec 2022 20:32:36 +0200 Subject: [PATCH 3/3] Removed DOCKER_BUILDKIT --- spotty/deployment/container/docker/docker_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spotty/deployment/container/docker/docker_commands.py b/spotty/deployment/container/docker/docker_commands.py index 24a7d5c..2dcbbec 100644 --- a/spotty/deployment/container/docker/docker_commands.py +++ b/spotty/deployment/container/docker/docker_commands.py @@ -12,7 +12,7 @@ def build(self, image_name: str) -> str: if not self._instance_config.docker_context_path: raise ValueError('Cannot generate the "build" command as Docker context path is not set') - build_cmd = 'DOCKER_BUILDKIT=1 docker build -t %s -f %s %s' % (image_name, shlex.quote(self._instance_config.dockerfile_path), + build_cmd = 'docker build -t %s -f %s %s' % (image_name, shlex.quote(self._instance_config.dockerfile_path), shlex.quote(self._instance_config.docker_context_path)) if self._instance_config.container_config.run_as_host_user: