Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zombienet-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
parity
Mirrored projects
zombienet-sdk
Commits
cd5c765f
Unverified
Commit
cd5c765f
authored
10 months ago
by
André Silva
Committed by
GitHub
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
fix(docker): don't early exit if docker binary isn't available (#211)
parent
e5cb1534
Branches
Branches containing commit
No related merge requests found
Pipeline
#474666
passed with stage
in 18 minutes and 53 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
crates/provider/src/docker/client.rs
+13
-10
13 additions, 10 deletions
crates/provider/src/docker/client.rs
with
13 additions
and
10 deletions
crates/provider/src/docker/client.rs
+
13
−
10
View file @
cd5c765f
...
...
@@ -186,21 +186,24 @@ impl DockerClient {
}
async
fn
is_using_podman
()
->
Result
<
bool
>
{
let
result
=
tokio
::
process
::
Command
::
new
(
"docker"
)
if
let
Ok
(
output
)
=
tokio
::
process
::
Command
::
new
(
"docker"
)
.arg
(
"version"
)
.output
()
.await
{
// detect whether we're actually running podman with docker emulation
return
Ok
(
String
::
from_utf8_lossy
(
&
output
.stdout
)
.to_lowercase
()
.contains
(
"podman"
));
}
tokio
::
process
::
Command
::
new
(
"podman"
)
.arg
(
"--version"
)
.output
()
.await
.map_err
(|
err
|
anyhow!
(
"Failed to detect container engine: {err}"
))
?
;
if
!
result
.status
.success
()
{
return
Err
(
anyhow!
(
"Failed to detect container engine: {}"
,
String
::
from_utf8_lossy
(
&
result
.stderr
)
)
.into
());
}
Ok
(
String
::
from_utf8_lossy
(
&
result
.stdout
)
.contains
(
"podman"
))
Ok
(
true
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment