Merge pull request #168 from open-runtimes/feat-uncompressed-builds

Feat: Uncompressed builds

Author: Meldiron

src/Executor/Runner/Docker.php

@@ -442,9 +442,19 @@ public function createRuntime(
         /**
          * Temporary file paths in the executor
          */
+        $buildFile = "code.tar.gz";
+        if (($variables['OPEN_RUNTIMES_BUILD_COMPRESSION'] ?? '') === 'none') {
+            $buildFile = "code.tar";
+        }
+
+        $sourceFile = "code.tar.gz";
+        if (\pathinfo($source, PATHINFO_EXTENSION) === 'tar') {
+            $sourceFile = "code.tar";
+        }
+
         $tmpFolder = "tmp/$runtimeName/";
-        $tmpSource = "/{$tmpFolder}src/code.tar.gz";
-        $tmpBuild = "/{$tmpFolder}builds/code.tar.gz";
+        $tmpSource = "/{$tmpFolder}src/$sourceFile";
+        $tmpBuild = "/{$tmpFolder}builds/$buildFile";
         $tmpLogging = "/{$tmpFolder}logging"; // Build logs
         $tmpLogs = "/{$tmpFolder}logs"; // Runtime logs
 
@@ -576,8 +586,7 @@ public function createRuntime(
                 $container['size'] = $size;
 
                 $destinationDevice = $this->getStorageDevice($destination);
-                $path = $destinationDevice->getPath(\uniqid() . '.' . \pathinfo('code.tar.gz', PATHINFO_EXTENSION));
-
+                $path = $destinationDevice->getPath(\uniqid() . '.' . \pathinfo($tmpBuild, PATHINFO_EXTENSION));
 
                 if (!$localDevice->transfer($tmpBuild, $path, $destinationDevice)) {
                     throw new Exception('Failed to move built code to storage', 500);

tests/ExecutorTest.php

@@ -325,6 +325,53 @@ public function testBuildOutputDirectory(): void
         $this->assertEquals(200, $response['headers']['status-code']);
     }
 
+    public function testBuildUncompressed(): void
+    {
+        $output = '';
+        Console::execute('cd /app/tests/resources/functions/node && tar --exclude code.tar.gz -czf code.tar.gz .', '', $output);
+
+        $runtimeId = \bin2hex(\random_bytes(4));
+
+        /** Build runtime */
+        $params = [
+            'runtimeId' => 'test-build-' . $runtimeId,
+            'source' => '/storage/functions/node/code.tar.gz',
+            'destination' => '/storage/builds/test',
+            'entrypoint' => 'index.js',
+            'image' => 'openruntimes/node:v5-22',
+            'command' => 'tar -zxf /tmp/code.tar.gz -C /mnt/code && bash helpers/build.sh "npm install"',
+            'variables' => [
+                'OPEN_RUNTIMES_BUILD_COMPRESSION' => 'none'
+            ]
+        ];
+
+        $response = $this->client->call(Client::METHOD_POST, '/runtimes', [], $params);
+        $this->assertEquals(201, $response['headers']['status-code']);
+        $this->assertNotEmpty($response['body']['path']);
+
+        $buildPath = $response['body']['path'];
+
+        /** Ensure build folder exists (container still running) */
+        $tmpFolderPath = '/tmp/executor-test-build-' . $runtimeId;
+        $this->assertTrue(\is_dir($tmpFolderPath));
+        $this->assertTrue(\file_exists($tmpFolderPath));
+
+        $response = $this->client->call(Client::METHOD_POST, '/runtimes/test-exec-' . $runtimeId . '/executions', [], [
+            'source' => $buildPath,
+            'entrypoint' => 'index.js',
+            'image' => 'openruntimes/node:v5-22',
+            'runtimeEntrypoint' => 'cp /tmp/code.tar /mnt/code/code.tar && nohup helpers/start.sh "bash helpers/server.sh"',
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(200, $response['body']['statusCode']);
+        $json = json_decode($response['body']['body'], true);
+        $this->assertEquals("Hello Open Runtimes 👋", $json['message']);
+
+        $response = $this->client->call(Client::METHOD_DELETE, '/runtimes/test-exec-' . $runtimeId, [], []);
+        $this->assertEquals(200, $response['headers']['status-code']);
+    }
+
     public function testExecute(): void
     {
         /** Prepare function */