Skip to content

Compabitility fix for Docker >= 1.11 (docker/docker#19490)#1548

Merged
asfgit merged 1 commit intoapache:masterfrom
moul:patch-2
Oct 13, 2016
Merged

Compabitility fix for Docker >= 1.11 (docker/docker#19490)#1548
asfgit merged 1 commit intoapache:masterfrom
moul:patch-2

Conversation

@moul
Copy link
Contributor

@moul moul commented May 14, 2016

No description provided.

@wido
Copy link
Contributor

wido commented May 17, 2016

LGTM

Very simple Docker fix

@swill
Copy link
Contributor

swill commented May 17, 2016

@moul can you post some verification that this fix works?

@moul
Copy link
Contributor Author

moul commented May 24, 2016

@swill, this solution is backward compatible, the .dockerinit file always cohabited with .dockerenv, until recently, .dockerinit was removed while .dockerenv is still there

@swill
Copy link
Contributor

swill commented May 24, 2016

@moul can you close and reopen the PR or rebase and force push in order to kick off Jenkins again so we can get this all green?

@pdion891 I think you have spent enough time with Docker to give me the the missing LGTM vote. Thanks...

@pdion891
Copy link
Contributor

pdion891 commented May 24, 2016

LGTM

@dmabry
Copy link
Contributor

dmabry commented Jun 9, 2016

LGTM based code review. This is a very straight forward change.

@bvbharatk
Copy link
Contributor

bvbharatk commented Jun 18, 2016

ACS CI BVT Run

Sumarry:
Build Number 190
Hypervisor xenserver
NetworkType Advanced
Passed=72
Failed=1
Skipped=3

Link to logs Folder (search by build_no): https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

Failed tests:

  • test_vm_life_cycle.py
    • test_10_attachAndDetach_iso Failing since 2 runs

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_static_role_account_acls
test_deploy_vgpu_enabled_vm

Passed test suits:
test_deploy_vm_with_userdata.py
test_affinity_groups_projects.py
test_portable_publicip.py
test_vpc_vpn.py
test_over_provisioning.py
test_global_settings.py
test_scale_vm.py
test_service_offerings.py
test_routers_iptables_default_policy.py
test_routers.py
test_reset_vm_on_reboot.py
test_snapshots.py
test_deploy_vms_with_varied_deploymentplanners.py
test_login.py
test_list_ids_parameter.py
test_public_ip_range.py
test_multipleips_per_nic.py
test_regions.py
test_affinity_groups.py
test_network_acl.py
test_pvlan.py
test_volumes.py
test_nic.py
test_deploy_vm_root_resize.py
test_resource_detail.py
test_secondary_storage.py
test_disk_offerings.py

@moul
Copy link
Contributor Author

moul commented Jun 30, 2016

Rebased for Travis

@karuturi
Copy link
Member

karuturi commented Oct 13, 2016

merging this now

@asfgit asfgit merged commit c92dcd2 into apache:master Oct 13, 2016
asfgit pushed a commit that referenced this pull request Oct 13, 2016
@karuturi
Merge pull request #1548 from moul/patch-2
f3b132f 
Compabitility fix for Docker >= 1.11 (moby/moby#19490)

* pr/1548:
  Compabitility fix for Docker >= 1.11 (moby/moby#19490)

Signed-off-by: Rajani Karuturi <[email protected]>
@moul moul deleted the patch-2 branch October 13, 2016 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@moul @wido @swill @pdion891 @dmabry @bvbharatk @karuturi @asfgit