فهرست منبع

We need to pass the full command and not rely on ENTRYPOINT for ACI containers, ACI overrides the ENTRYPOINT with commands.

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 5 سال پیش
والد
کامیت
3dddbcd7df
3فایلهای تغییر یافته به همراه3 افزوده شده و 4 حذف شده
  1. 1 1
      aci/convert/convert.go
  2. 1 1
      aci/convert/convert_test.go
  3. 1 2
      aci/etchosts/Dockerfile

+ 1 - 1
aci/convert/convert.go

@@ -129,7 +129,7 @@ func ToContainerGroup(ctx context.Context, aciContext store.AciContext, p types.
 }
 
 func getDNSSidecar(containers []containerinstance.Container) containerinstance.Container {
-	var names []string
+	names := []string{"/hosts"}
 	for _, container := range containers {
 		names = append(names, *container.Name)
 	}

+ 1 - 1
aci/convert/convert_test.go

@@ -179,7 +179,7 @@ func TestComposeContainerGroupToContainerWithDnsSideCarSide(t *testing.T) {
 	assert.Equal(t, *(*group.Containers)[1].Name, "service2")
 	assert.Equal(t, *(*group.Containers)[2].Name, ComposeDNSSidecarName)
 
-	assert.DeepEqual(t, *(*group.Containers)[2].Command, []string{"service1", "service2"})
+	assert.DeepEqual(t, *(*group.Containers)[2].Command, []string{"/hosts", "service1", "service2"})
 
 	assert.Equal(t, *(*group.Containers)[0].Image, "image1")
 	assert.Equal(t, *(*group.Containers)[1].Image, "image2")

+ 1 - 2
aci/etchosts/Dockerfile

@@ -18,5 +18,4 @@ COPY . .
 RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/hosts main/main.go
 
 FROM scratch
-COPY --from=builder /go/bin/hosts /hosts
-ENTRYPOINT ["/hosts"]
+COPY --from=builder /go/bin/hosts /hosts