Browse Source

increase the timeout for dockerfile

NET-3914-gha-resolve-the-issue-of-running-multiple-docker-container
cskh 2 years ago
parent
commit
cbc8324063
  1. 12
      .github/workflows/test-integrations.yml
  2. 1
      test/integration/consul-container/libs/cluster/app.go
  3. 2
      test/integration/consul-container/libs/service/connect.go
  4. 2
      test/integration/consul-container/libs/service/examples.go
  5. 2
      test/integration/consul-container/libs/service/gateway.go

12
.github/workflows/test-integrations.yml

@ -611,6 +611,10 @@ jobs:
path: .
- name: restore mode+x
run: chmod +x consul
- name: docker verson and info
run: |
docker version
docker info
- name: Build consul:local image
run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
- name: Configure GH workaround for ipv6 loopback
@ -684,6 +688,10 @@ jobs:
path: .
- name: restore mode+x
run: chmod +x consul
- name: docker verson and info
run: |
docker version
docker info
- name: Build consul:local image
run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
- name: Configure GH workaround for ipv6 loopback
@ -757,6 +765,10 @@ jobs:
path: .
- name: restore mode+x
run: chmod +x consul
- name: docker verson and info
run: |
docker version
docker info
- name: Build consul:local image
run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
- name: Configure GH workaround for ipv6 loopback

1
test/integration/consul-container/libs/cluster/app.go

@ -39,6 +39,7 @@ func LaunchContainerOnNode(
if req.Name == "" {
return nil, fmt.Errorf("ContainerRequest requires the Name field")
}
if req.NetworkMode != "" {
return nil, fmt.Errorf("caller should not configure ContainerRequest.NetworkMode")
}

2
test/integration/consul-container/libs/service/connect.go

@ -187,7 +187,7 @@ func NewConnectService(ctx context.Context, sidecarCfg SidecarConfig, serviceBin
req := testcontainers.ContainerRequest{
FromDockerfile: dockerfileCtx,
WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second),
WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second),
AutoRemove: false,
Name: containerName,
Cmd: []string{

2
test/integration/consul-container/libs/service/examples.go

@ -153,7 +153,7 @@ func NewExampleService(ctx context.Context, name string, httpPort int, grpcPort
req := testcontainers.ContainerRequest{
Image: hashicorpDockerProxy + "/fortio/fortio",
WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second),
WaitingFor: wait.ForLog("").WithStartupTimeout(30 * time.Second),
AutoRemove: false,
Name: containerName,
Cmd: command,

2
test/integration/consul-container/libs/service/gateway.go

@ -196,7 +196,7 @@ func NewGatewayServiceReg(ctx context.Context, gwCfg GatewayConfig, node libclus
req := testcontainers.ContainerRequest{
FromDockerfile: dockerfileCtx,
WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second),
WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second),
AutoRemove: false,
Name: containerName,
Env: make(map[string]string),

Loading…
Cancel
Save