Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the docker tests into a test package #2269

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
8 changes: 4 additions & 4 deletions docker.go
Expand Up @@ -922,7 +922,7 @@ func (p *DockerProvider) CreateContainer(ctx context.Context, req ContainerReque
// If default network is not bridge make sure it is attached to the request
// as container won't be attached to it automatically
// in case of Podman the bridge network is called 'podman' as 'bridge' would conflict
if p.DefaultNetwork != p.defaultBridgeNetworkName {
if p.DefaultNetwork != p.DefaultBridgeNetworkName {
isAttached := false
for _, net := range req.Networks {
if net == p.DefaultNetwork {
Expand Down Expand Up @@ -1076,7 +1076,7 @@ func (p *DockerProvider) CreateContainer(ctx context.Context, req ContainerReque
// default hooks include logger hook and pre-create hook
defaultHooks := []ContainerLifecycleHooks{
DefaultLoggingHook(p.Logger),
defaultPreCreateHook(ctx, p, req, dockerInput, hostConfig, networkingConfig),
DefaultPreCreateHook(p, dockerInput, hostConfig, networkingConfig),
defaultCopyFileToContainerHook(req.Files),
defaultLogConsumersHook(req.LogConsumerCfg),
defaultReadinessHook(),
Expand Down Expand Up @@ -1479,8 +1479,8 @@ func (p *DockerProvider) getDefaultNetwork(ctx context.Context, cli client.APICl
reaperNetworkExists := false

for _, net := range networkResources {
if net.Name == p.defaultBridgeNetworkName {
return p.defaultBridgeNetworkName, nil
if net.Name == p.DefaultBridgeNetworkName {
return p.DefaultBridgeNetworkName, nil
}

if net.Name == reaperNetwork {
Expand Down