buildah and nerdctl fixes

This commit is contained in:
Maxime Van Hees
2025-07-09 16:27:11 +02:00
parent d431705501
commit 568a5b0a49
6 changed files with 375 additions and 240 deletions

View File

@@ -21,13 +21,8 @@ fn assert_eq(actual, expected, message) {
// Helper function to check if buildah is available
fn is_buildah_available() {
try {
let command = run("which buildah");
let result = command.execute();
return result.success;
} catch(err) {
return false;
}
let command = run("which buildah");
return command.silent().execute().success;
}
print("=== Testing Buildah Builder Pattern ===");
@@ -36,8 +31,7 @@ print("=== Testing Buildah Builder Pattern ===");
let buildah_available = is_buildah_available();
if !buildah_available {
print("Buildah is not available. Skipping Buildah tests.");
// Exit gracefully without error
return;
throw err;
}
print("✓ Buildah is available");

View File

@@ -21,13 +21,8 @@ fn assert_eq(actual, expected, message) {
// Helper function to check if buildah is available
fn is_buildah_available() {
try {
let command = run("which buildah");
let result = command.execute();
return result.success;
} catch(err) {
return false;
}
let command = run("which buildah");
return command.silent().execute().success;
}
// Helper function to check if an image exists
@@ -56,8 +51,7 @@ print("=== Testing Buildah Image Operations ===");
let buildah_available = is_buildah_available();
if !buildah_available {
print("Buildah is not available. Skipping Buildah tests.");
// Exit gracefully without error
return;
throw err;
}
print("✓ Buildah is available");

View File

@@ -21,13 +21,8 @@ fn assert_eq(actual, expected, message) {
// Helper function to check if buildah is available
fn is_buildah_available() {
try {
let command = run("which buildah");
let result = command.execute();
return result.success;
} catch(err) {
return false;
}
let command = run("which buildah");
return command.silent().execute().success;
}
print("=== Testing Buildah Container Operations ===");
@@ -36,8 +31,7 @@ print("=== Testing Buildah Container Operations ===");
let buildah_available = is_buildah_available();
if !buildah_available {
print("Buildah is not available. Skipping Buildah tests.");
// Exit gracefully without error
return;
throw err;
}
print("✓ Buildah is available");

View File

@@ -21,22 +21,31 @@ fn assert_eq(actual, expected, message) {
// Helper function to check if nerdctl is available
fn is_nerdctl_available() {
try {
let result = run("which nerdctl");
return result.success;
} catch(err) {
return false;
}
let command = run("which nerdctl");
return command.silent().execute().success;
}
// Helper function to check if a container exists
fn container_exists(container_name) {
try {
let result = run(`nerdctl ps -a --format "{{.Names}}" | grep -w ${container_name}`);
return result.success;
} catch(err) {
// let command = run(`nerdctl ps -a --format "{{.Names}}" | grep -w ${container_name}`);
let command = run(`nerdctl ps -a --format "{{.Names}}"`);
let result = command.silent().execute();
// Check if the command was successful
if !result.success {
print(`Error executing 'nerdctl ps': ${result.stderr}`);
return false;
}
// Split the output into individual lines (names)
// and check if any of them is an exact match for our container name.
for line in result.stdout.split('\n') {
if line.trim() == container_name {
return true; // Found the container
}
}
return false; // Did not find the container
}
// Helper function to clean up a container if it exists
@@ -49,6 +58,8 @@ fn cleanup_container(container_name) {
} catch(err) {
print(`Error cleaning up container ${container_name}: ${err}`);
}
} else {
print!(`No container with name ${container_name} found. Nothing to clean up.`);
}
}
@@ -58,8 +69,7 @@ print("=== Testing Nerdctl Container Operations ===");
let nerdctl_available = is_nerdctl_available();
if !nerdctl_available {
print("nerdctl is not available. Skipping Nerdctl tests.");
// Exit gracefully without error
return;
throw err;
}
print("✓ nerdctl is available");
@@ -81,84 +91,127 @@ try {
assert_eq(container.container_id, "", "Container ID should be empty initially");
// Test setting container image
print("Testing with_image()...");
container.with_image("alpine:latest");
print("Testing image setter...");
container.image = "alpine:latest";
assert_eq(container.image, "alpine:latest", "Container image should match");
// Test setting container config
print("Testing config setter...");
let config_options = #{"key1": "value1", "key2": "value2"};
container.config = config_options;
assert_eq(container.config, config_options, "Container config options should match");
// Test container_id setter and getter
print("Testing container_id setter...");
container.container_id = "test-id";
assert_eq(container.container_id, "test-id", "Container ID should be 'test-id'");
// Test setting detach mode
print("Testing with_detach()...");
container.with_detach(true);
assert_true(container.detach, "Container detach mode should be true");
// Test ports setter and getter
print("Testing ports setter and getter...");
let ports_list = ["1234", "2345"];
container.ports = ports_list;
assert_eq(container.ports, ports_list, "Container ports should match");
// Test volumes setter and getter
print("Testing volumes setter and getter...");
let volumes_list = ["/tmp:/tmp"];
container.volumes = volumes_list;
assert_eq(container.volumes, volumes_list, "Container volumes should match");
// Test env_vars setter and getter
print("Testing env_vars setter and getter...");
let env_vars_map = #{"VAR1": "value1", "VAR2": "value2"};
container.env_vars = env_vars_map;
assert_eq(container.env_vars, env_vars_map, "Container env_vars should match");
// Test network setter and getter
print("Testing network setter and getter...");
container.network = "test-net";
assert_eq(container.network, "test-net", "Container network should match");
// Test network_aliases setter and getter
print("Testing network_aliases setter and getter...");
let aliases = ["alias1", "alias2"];
container.network_aliases = aliases;
assert_eq(container.network_aliases, aliases, "Container network_aliases should match");
// Test cpu_limit setter and getter
print("Testing cpu_limit setter and getter...");
container.cpu_limit = "0.5";
assert_eq(container.cpu_limit, "0.5", "Container cpu_limit should match");
// Test memory_limit setter and getter
print("Testing memory_limit setter and getter...");
container.memory_limit = "512m";
assert_eq(container.memory_limit, "512m", "Container memory_limit should match");
// Test memory_swap_limit setter and getter
print("Testing memory_swap_limit setter and getter...");
container.memory_swap_limit = "1g";
assert_eq(container.memory_swap_limit, "1g", "Container memory_swap_limit should match");
// Test cpu_shares setter and getter
print("Testing cpu_shares setter and getter...");
container.cpu_shares = "1024";
assert_eq(container.cpu_shares, "1024", "Container cpu_shares should match");
// Test restart_policy setter and getter
print("Testing restart_policy setter and getter...");
container.restart_policy = "always";
assert_eq(container.restart_policy, "always", "Container restart_policy should match");
// Test detach setter and getter
print("Testing detach setter and getter...");
container.detach = false;
assert_eq(container.detach, false, "Container detach should be false");
container.detach = true;
assert_eq(container.detach, true, "Container detach should be true");
// TODO: Test health_check setter and getter
print("Testing health_check setter and getter...");
// Test setting environment variables
print("Testing with_env()...");
container.with_env("TEST_VAR", "test_value");
// Test snapshotter setter and getter
print("Testing snapshotter setter and getter...");
container.snapshotter = "stargz";
assert_eq(container.snapshotter, "stargz", "Container snapshotter should match");
// // Test running the container
// print("Testing run()...");
// let run_result = container.run();
// assert_true(run_result.success, "Container run should succeed");
// assert_true(container.container_id != "", "Container ID should not be empty after run");
// print(`✓ run(): Container started with ID: ${container.container_id}`);
// Test setting multiple environment variables
print("Testing with_envs()...");
let env_map = #{
"VAR1": "value1",
"VAR2": "value2"
};
container.with_envs(env_map);
// // Test executing a command in the container
// print("Testing exec()...");
// let exec_result = container.exec("echo 'Hello from container'");
// assert_true(exec_result.success, "Container exec should succeed");
// assert_true(exec_result.stdout.contains("Hello from container"), "Exec output should contain expected text");
// print("✓ exec(): Command executed successfully");
// Test setting ports
print("Testing with_port()...");
container.with_port("8080:80");
// // Test getting container logs
// print("Testing logs()...");
// let logs_result = container.logs();
// assert_true(logs_result.success, "Container logs should succeed");
// print("✓ logs(): Logs retrieved successfully");
// Test setting multiple ports
print("Testing with_ports()...");
container.with_ports(["9090:90", "7070:70"]);
// // Test stopping the container
// print("Testing stop()...");
// let stop_result = container.stop();
// assert_true(stop_result.success, "Container stop should succeed");
// print("✓ stop(): Container stopped successfully");
// Test setting volumes
print("Testing with_volume()...");
// Create a test directory for volume mounting
let test_dir = "rhai_test_nerdctl_volume";
mkdir(test_dir);
container.with_volume(`${test_dir}:/data`);
// // Test removing the container
// print("Testing remove()...");
// let remove_result = container.remove();
// assert_true(remove_result.success, "Container remove should succeed");
// print("✓ remove(): Container removed successfully");
// Test setting resource limits
print("Testing with_cpu_limit() and with_memory_limit()...");
container.with_cpu_limit("0.5");
container.with_memory_limit("256m");
// // Clean up test directory
// delete(test_dir);
// print("✓ Cleanup: Test directory removed");
// Test running the container
print("Testing run()...");
let run_result = container.run();
assert_true(run_result.success, "Container run should succeed");
assert_true(container.container_id != "", "Container ID should not be empty after run");
print(`✓ run(): Container started with ID: ${container.container_id}`);
// Test executing a command in the container
print("Testing exec()...");
let exec_result = container.exec("echo 'Hello from container'");
assert_true(exec_result.success, "Container exec should succeed");
assert_true(exec_result.stdout.contains("Hello from container"), "Exec output should contain expected text");
print("✓ exec(): Command executed successfully");
// Test getting container logs
print("Testing logs()...");
let logs_result = container.logs();
assert_true(logs_result.success, "Container logs should succeed");
print("✓ logs(): Logs retrieved successfully");
// Test stopping the container
print("Testing stop()...");
let stop_result = container.stop();
assert_true(stop_result.success, "Container stop should succeed");
print("✓ stop(): Container stopped successfully");
// Test removing the container
print("Testing remove()...");
let remove_result = container.remove();
assert_true(remove_result.success, "Container remove should succeed");
print("✓ remove(): Container removed successfully");
// Clean up test directory
delete(test_dir);
print("✓ Cleanup: Test directory removed");
print("All container operations tests completed successfully!");
// print("All container operations tests completed successfully!");
} catch(err) {
print(`Error: ${err}`);