Changed Alpine detection to something that actually works

Author: mikicz

arca/backend/docker.py

@@ -78,6 +78,7 @@ def __init__(self, **kwargs):
 
         self._containers = set()
         self.client = None
+        self.alpine_inherited = None
 
     def validate_configuration(self):
         """
@@ -647,45 +648,22 @@ def tar_task_definition(self, name: str, contents: str) -> bytes:
 
         return tarstream.getvalue()
 
-    def tar_alpine_alias(self):
-        """ Returns a tar with a file with an alias definition thats needed for Alpine.
-        """
-        tarstream = BytesIO()
-        tar = tarfile.TarFile(fileobj=tarstream, mode='w')
-        tarinfo = tarfile.TarInfo(name=".profile")
-
-        script_bytes = "if grep -q Alpine /etc/issue; then alias timeout=\"timeout -t\"; fi".encode("utf-8")
-        tarinfo.size = len(script_bytes)
-        tarinfo.mtime = int(time.time())
-        tar.addfile(tarinfo, BytesIO(script_bytes))
-        tar.close()
-
-        return tarstream.getvalue()
-
     def start_container(self, image, container_name: str, repo_path: Path):
         """ Starts a container with the image and name ``container_name`` and copies the repository into the container.
 
         :type image: docker.models.images.Image
         :rtype: docker.models.container.Container
         """
         command = "bash -i"
-        env = {}
 
         if self.inherit_image:
             command = "sh -i"
-            env = {"ENV": "/root/.profile"}
 
         container = self.client.containers.run(image, command=command, detach=True, tty=True, name=container_name,
                                                working_dir=str((Path("/srv/data") / self.cwd).resolve()),
-                                               auto_remove=True, environment=env)
+                                               auto_remove=True)
 
         container.exec_run(["mkdir", "-p", "/srv/scripts"])
-
-        # alpine uses a different timeout, an alias is needed
-        if self.inherit_image:
-            container.put_archive("/root", self.tar_alpine_alias())
-            container.exec_run(["chmod", "+x", "/root/.profile"])
-
         container.put_archive("/srv", self.tar_files(repo_path))
         container.put_archive("/srv/scripts", self.tar_runner())
 
@@ -768,12 +746,21 @@ def run(self, repo: str, branch: str, task: Task, git_repo: Repo, repo_path: Pat
         res = None
 
         try:
-            res = container.exec_run(["timeout",
-                                      str(task.timeout),
-                                      "python",
-                                      "/srv/scripts/runner.py",
-                                      f"/srv/scripts/{task_filename}"],
-                                     tty=True)
+            command = ["timeout"]
+
+            if self.inherit_image:
+                if self.alpine_inherited or b"Alpine" in container.exec_run(["cat", "/etc/issue"], tty=True).output:
+                    self.alpine_inherited = True
+                    command = ["timeout", "-t"]
+
+            command += [str(task.timeout),
+                        "python",
+                        "/srv/scripts/runner.py",
+                        f"/srv/scripts/{task_filename}"]
+
+            logger.debug("Running command %s", " ".join(command))
+
+            res = container.exec_run(command, tty=True)
 
             # 124 is the standard, 143 on alpine
             if res.exit_code in {124, 143}:

arca/result.py

@@ -10,11 +10,15 @@ class Result:
 
     def __init__(self, result: Union[str, Dict[str, Any]]) -> None:
         if isinstance(result, (str, bytes, bytearray)):
+            output = result
             try:
                 result = json.loads(result)
             except ValueError:
                 raise BuildError("The build failed (the output was corrupted, "
-                                 "possibly by the callable printing something)")
+                                 "possibly by the callable printing something)",
+                                 extra_info={
+                                    "output": output
+                                 })
 
         if not isinstance(result, dict):
             raise BuildError("The build failed (the value returned from the runner was not valid)")