Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow docker0 CIDR to be specified #22

Merged
merged 4 commits into from Apr 10, 2014
Merged

Allow docker0 CIDR to be specified #22

merged 4 commits into from Apr 10, 2014

Commits on Feb 24, 2014

  1. Updates README for setting docker0 CIDR

    Isaac Boehman committed Feb 24, 2014
    Copy the full SHA
    df48268 View commit details
    Browse the repository at this point in the history

  2. Adds DOCKER0_CIDR config directive to dvm.conf

    Isaac Boehman committed Feb 24, 2014
    Copy the full SHA
    22e24ad View commit details
    Browse the repository at this point in the history

  3. Updates Vagrantfile to set docker0 CIDR if given 

     * bridge_utils needed to be installed
 * docker0 interface needed to be shutdown
 * docker0 interface needed to be deleted
 * args passed to docker needed to be updated
    Isaac Boehman committed Feb 24, 2014
    Copy the full SHA
    b4d5970 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. Merge branch 'fix/unable-to-stop-delete-containers' into feature/set-… 

    …docker0-cidr
    Isaac Boehman committed Feb 25, 2014
    Copy the full SHA
    47922c8 View commit details
    Browse the repository at this point in the history