Skip to content

Commit

Permalink
Merge pull request #3933 from open-horizon/revert-3932-zhangl/e2edevF…
Browse files Browse the repository at this point in the history
…ailure

Revert "#3931 - Bug: e2edev failed since move to Docker 24.0.7"
  • Loading branch information
bencourliss authored Nov 7, 2023
2 parents e03a970 + 23fa8c1 commit f2ba120
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions container/container.go
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

0 comments on commit f2ba120

Please sign in to comment.