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

Revert "open-horizon#3931 - Bug: e2edev failed since move to Docker 24.0.7" #3933

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Revert "open-horizon#3931 - Bug: e2edev failed since move to Docker 24.0.7" #3933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ func (b *ContainerWorker) ResourcesCreate(agreementId string, agreementProtocol

if existingContainer == nil {
// only create container if there wasn't one
servicePair.serviceConfig.HostConfig.NetworkMode = "bridge"
servicePair.serviceConfig.HostConfig.NetworkMode = bridgeName
if err := serviceStart(b.client, agreementId, containerName, shareLabel, servicePair.serviceConfig, eps, ms_sharedendpoints, &postCreateContainers, fail, true); err != nil {
return nil, err
}
Expand Down Expand Up @@ -1481,7 +1481,7 @@ func (b *ContainerWorker) ResourcesCreate(agreementId string, agreementProtocol
// every one of these gets wired to both the agBridge and every shared bridge from this agreement
for serviceName, servicePair := range private {
if servicePair.serviceConfig.HostConfig.NetworkMode == "" {
servicePair.serviceConfig.HostConfig.NetworkMode = "bridge" // custom bridge has agreementId as name, same as endpoint key
servicePair.serviceConfig.HostConfig.NetworkMode = agreementId // custom bridge has agreementId as name, same as endpoint key
}
var endpoints map[string]*docker.EndpointConfig
if servicePair.serviceConfig.HostConfig.NetworkMode != "host" {
Expand Down
Loading