Skip to content

Commit

Permalink
Revert "use podman socket"
Browse files Browse the repository at this point in the history
This reverts commit 744e330.
  • Loading branch information
tedim52 committed Jul 12, 2024
1 parent ca0da34 commit 3e20f4c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ package backend_creator
import (
"context"
"fmt"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/database_accessors/enclave_db"
"net"
"os"
"path"

"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/database_accessors/enclave_db"

"github.com/docker/docker/client"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_collector_functions"
Expand All @@ -28,7 +27,7 @@ import (

const (
unixSocketPrefix = "unix://"
systemDaemonSocket = "/var/run/podman/podman.sock"
systemDaemonSocket = "/var/run/docker.sock"
userOwnDaemonSocket = "/.docker/run/docker.sock"

noTempDirPrefix = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,14 @@ const (
EngineTransportProtocol = port_spec.TransportProtocol_TCP

// This needs to be bind-mounted into the engine & API containers so they can manipulate Docker
DockerSocketFilepath = "/var/run/podman/podman.sock"
DockerSocketFilepath = "/var/run/docker.sock"

// The host engine config directory to mount and its local mapping
HostEngineConfigDirToMount = "/root/engine_config"
EngineConfigLocalDir = "/run/engine"

//The Docker network name where all the containers in the engine and logs service context will be added
// NameOfNetworkToStartEngineAndLogServiceContainersIn = "bridge"
// HttpApplicationProtocol = "http"
// The Docker network name where all the containers in the engine and logs service context will be added
NameOfNetworkToStartEngineAndLogServiceContainersIn = "podman"
NameOfNetworkToStartEngineAndLogServiceContainersIn = "bridge"
HttpApplicationProtocol = "http"

GitHubAuthStorageDirPath = "/kurtosis-data/github-auth/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ entryPoints:
providers:
docker:
endpoint: "unix:///var/run/podman/podman.sock"
endpoint: "unix:///var/run/docker.sock"
exposedByDefault: false
network: "{{ .NetworkId }}"
`
Expand Down

0 comments on commit 3e20f4c

Please sign in to comment.