From 3e20f4c2012a0f6100bd3e01db15cbca6e769606 Mon Sep 17 00:00:00 2001 From: Tedi Mitiku Date: Fri, 12 Jul 2024 16:17:05 -0400 Subject: [PATCH] Revert "use podman socket" This reverts commit 744e330693ca37ed4ecd29c1ae86d7a8eff019fc. --- .../backend_creator/backend_creator.go | 5 ++--- .../docker/docker_kurtosis_backend/consts/consts.go | 7 ++----- .../implementations/traefik/consts.go | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go index 234cedff40..86d787d599 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go @@ -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" @@ -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 = "" diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/consts/consts.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/consts/consts.go index 2da615c2bd..a13632c54e 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/consts/consts.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/consts/consts.go @@ -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/" diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/reverse_proxy_functions/implementations/traefik/consts.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/reverse_proxy_functions/implementations/traefik/consts.go index bf2b63fc56..7df8087c81 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/reverse_proxy_functions/implementations/traefik/consts.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/reverse_proxy_functions/implementations/traefik/consts.go @@ -28,7 +28,7 @@ entryPoints: providers: docker: - endpoint: "unix:///var/run/podman/podman.sock" + endpoint: "unix:///var/run/docker.sock" exposedByDefault: false network: "{{ .NetworkId }}" `