[aws][system] Add versioning to build images

Author: mcopik

sebs/benchmark.py

@@ -422,10 +422,11 @@ def install_dependencies(self, output_dir):
             )
         else:
             repo_name = self._system_config.docker_repository()
-            image_name = "build.{deployment}.{language}.{runtime}".format(
+            image_name = "build.{deployment}.{language}.{runtime}-{version}".format(
                 deployment=self._deployment_name,
                 language=self.language_name,
                 runtime=self.language_version,
+                version=self._system_config.version(),
             )
             try:
                 self._docker_client.images.get(repo_name + ":" + image_name)

sebs/config.py

@@ -67,6 +67,9 @@ def benchmark_base_images(
             architecture
         ]
 
+    def version(self) -> str:
+        return self._system_config["general"].get("SeBS_version", "unknown")
+
     def benchmark_image_name(
         self,
         system: str,

tools/build_docker_images.py

@@ -38,7 +38,7 @@ def build(image_type, system, language=None, version=None, version_name=None):
     if version:
         target += "." + version
     sebs_version = config["general"].get("SeBS_version", "unknown")
-    target += "." + sebs_version
+    target += "-" + sebs_version
 
     # if we pass an integer, the build will fail with 'connection reset by peer'
     buildargs = {
@@ -65,7 +65,7 @@ def build(image_type, system, language=None, version=None, version_name=None):
 def build_language(system, language, language_config):
     configs = []
     if "base_images" in language_config:
-        for version, base_image in language_config["base_images"].items():
+        for version, base_image in language_config["base_images"]["x64"].items():
             if args.language_version is not None and args.language_version == version:
                 configs.append([version, base_image])
             elif args.language_version is None: