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.

Sign up for GitHub

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

Jump to bottom

Move the docker tests into a test package #2269

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Move the docker tests into a test package #2269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58e24a5
Move the docker tests into a test package
Minivera Feb 28, 2024
09bacd6
Merge remote-tracking branch 'origin/main' into gui/move-core-test-to…
Minivera Feb 28, 2024
3b18b5f
Fix small linting issues due to renamed/moves variables
Minivera Feb 28, 2024
62f45ca
Merge branch 'main' into gui/move-core-test-to-test-package
mdelapenya Mar 4, 2024
e079909
Merge remote-tracking branch 'origin/main' into gui/move-core-test-to…
Minivera Mar 4, 2024
2f20304
Move everything to test helpers for now
Minivera Mar 4, 2024
3cb294b
Merge remote-tracking branch 'origin/main' into gui/move-core-test-to…
Minivera Mar 18, 2024
b4c209c
Separate the internal and external lifecycle hooks tests
Minivera Mar 18, 2024
d3bba42
Rename some default hooks so they can stay internal
Minivera Mar 18, 2024
bcba9fc
Merge branch 'main' into gui/move-core-test-to-test-package
Minivera Mar 18, 2024
a70d193
Merge branch 'main' into gui/move-core-test-to-test-package
Minivera Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
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
Loading
Loading