chore: execute modifiers the last

lifecycle.go

@@ -36,21 +36,6 @@ func (p *DockerProvider) preCreateContainerHook(ctx context.Context, req Contain
 		}
 	}
 
-	if req.ConfigModifier != nil {
-		req.ConfigModifier(dockerInput)
-	}
-
-	if req.HostConfigModifier == nil {
-		req.HostConfigModifier = defaultHostConfigModifier(req)
-	}
-	req.HostConfigModifier(hostConfig)
-
-	if req.EnpointSettingsModifier != nil {
-		req.EnpointSettingsModifier(endpointSettings)
-	}
-
-	networkingConfig.EndpointsConfig = endpointSettings
-
 	exposedPorts := req.ExposedPorts
 	// this check must be done after the pre-creation Modifiers are called, so the network mode is already set
 	if len(exposedPorts) == 0 && !hostConfig.NetworkMode.IsContainer() {
@@ -71,6 +56,20 @@ func (p *DockerProvider) preCreateContainerHook(ctx context.Context, req Contain
 	dockerInput.ExposedPorts = exposedPortSet
 	hostConfig.PortBindings = exposedPortMap
 
+	if req.ConfigModifier != nil {
+		req.ConfigModifier(dockerInput)
+	}
+
+	if req.HostConfigModifier == nil {
+		req.HostConfigModifier = defaultHostConfigModifier(req)
+	}
+	req.HostConfigModifier(hostConfig)
+
+	if req.EnpointSettingsModifier != nil {
+		req.EnpointSettingsModifier(endpointSettings)
+	}
+	networkingConfig.EndpointsConfig = endpointSettings
+
 	return nil
 }
 

lifecyle_test.go

@@ -96,8 +96,8 @@ func TestPreCreateModifierHook(t *testing.T) {
 		assert.Equal(t, nat.PortMap{
 			"80/tcp": []nat.PortBinding{
 				{
-					HostIP:   "",
-					HostPort: "",
+					HostIP:   "1",
+					HostPort: "2",
 				},
 			},
 		}, inputHostConfig.PortBindings,
@@ -148,15 +148,23 @@ func TestPreCreateModifierHook(t *testing.T) {
 
 		assert.Equal(
 			t,
-			nat.PortSet(nat.PortSet{}),
+			nat.PortSet{"80/tcp": struct{}{}},
 			inputConfig.ExposedPorts,
 			"Docker config's exposed ports should be empty",
 		)
 		assert.Equal(t,
-			nat.PortMap{},
+			nat.PortMap{
+				"80/tcp": []nat.PortBinding{
+					{
+						HostIP:   "1",
+						HostPort: "2",
+					},
+				},
+			},
 			inputHostConfig.PortBindings,
 			"Host config's portBinding should be empty",
 		)
+		assert.Equal(t, container.NetworkMode("container:foo"), inputHostConfig.NetworkMode, "Host config's network mode should be isContainer")
 	})
 
 	t.Run("Nil hostConfigModifier should apply default host config modifier", func(t *testing.T) {