Merge pull request #330 from gyermolenko/remove_docker_machine

Remove docker-machine parts

Author: jettify

CONTRIBUTING.rst

@@ -10,8 +10,7 @@ Fist of all just clone repository::
 
     $ git clone [email protected]:aio-libs/aiohttp_admin.git
 
-Install docker_ using instruction_ from the official site, for OSX we
-use docker-machine_.
+Install docker_ using instruction_ from the official site.
 
 Create virtualenv with python3.5 (older version are not supported). For example
 using *virtualenvwrapper* commands could look like::
@@ -56,13 +55,6 @@ Among results you should find something like::
     mongo     2.6  150dd5b5bd1b  9 weeks ago  390.9 MB
 
 
-For OSX users one extra step is required, before running tests, please
-init environment variables::
-
-    $ eval $(docker-machine env default)
-    $ export DOCKER_MACHINE_IP=$(docker-machine ip)
-
-
 Reporting an Issue
 ------------------
 If you have found issue with `aiohttp-admin` please do
@@ -82,4 +74,3 @@ information:
 
 .. _docker: https://www.docker.com/
 .. _instruction: https://docs.docker.com/engine/installation/linux/ubuntulinux/
-.. _docker-machine: https://docs.docker.com/machine/

demos/blog/aiohttpdemo_blog/utils.py

@@ -1,5 +1,3 @@
-import os
-
 import aiopg.sa
 import yaml
 
@@ -12,8 +10,6 @@ def load_config(fname):
 
 
 async def init_postgres(conf, loop):
-    host = os.environ.get('DOCKER_MACHINE_IP', '127.0.0.1')
-    conf['host'] = host
     engine = await aiopg.sa.create_engine(
         database=conf['database'],
         user=conf['user'],

demos/motortwit/motortwit/utils.py

@@ -1,5 +1,4 @@
 import pytz
-import os
 import yaml
 from hashlib import md5
 from dateutil.parser import parse
@@ -16,8 +15,6 @@ def load_config(fname):
 
 
 async def init_mongo(conf, loop):
-    host = os.environ.get('DOCKER_MACHINE_IP', '127.0.0.1')
-    conf['host'] = host
     mongo_uri = "mongodb://{}:{}".format(conf['host'], conf['port'])
     conn = aiomotor.AsyncIOMotorClient(
         mongo_uri,

demos/polls/aiohttpdemo_polls/templates/detail.html

@@ -2,7 +2,7 @@ <h1>{{ question.question_text }}</h1>
 
 {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
 
-<form action="{{ url('vote', parts={'question_id': question.id}) }}" method="post">
+<form action="{{ url('vote', question_id=question.id) }}" method="post">
 {% for choice in choices %}
     <input type="radio" name="choice" id="choice{{ loop.index }}" value="{{ choice.id }}" />
     <label for="choice{{ loop.index }}">{{ choice.choice_text }}</label><br />

demos/polls/aiohttpdemo_polls/templates/results.html

@@ -6,4 +6,4 @@ <h1>{{ question.question }}</h1>
 {% endfor %}
 </ul>
 
-<a href="{{ url('poll', parts={'question_id': question.id}) }}">Vote again?</a>
+<a href="{{ url('poll', question_id=question.id) }}">Vote again?</a>

demos/polls/aiohttpdemo_polls/utils.py

@@ -1,5 +1,4 @@
 import yaml
-import os
 import aiopg.sa
 
 
@@ -11,8 +10,6 @@ def load_config(fname):
 
 
 async def init_postgres(conf, loop):
-    host = os.environ.get('DOCKER_MACHINE_IP')
-    conf['host'] = host
     engine = await aiopg.sa.create_engine(
         database=conf['database'],
         user=conf['user'],

tests/docker_fixtures.py

@@ -1,4 +1,3 @@
-import os
 import time
 from pathlib import Path
 
@@ -8,7 +7,7 @@
 import pytest
 
 from docker import APIClient
-from docker import from_env
+
 
 TEMP_FOLDER = Path('/tmp') / 'aiohttp_admin'
 
@@ -29,17 +28,9 @@ def session_id():
     return 'aiohttp-admin-session'
 
 
-@pytest.fixture(scope='session')
-def host():
-    return os.environ.get('DOCKER_MACHINE_IP', '127.0.0.1')
-
-
 @pytest.fixture(scope='session')
 def docker():
-    if os.environ.get('DOCKER_MACHINE_IP') is not None:
-        docker = from_env(assert_hostname=False)
-    else:
-        docker = APIClient(version='auto')
+    docker = APIClient(version='auto')
     return docker
 
 
@@ -105,7 +96,7 @@ def wait_for_container(callable, image, skip_exception):
 
 
 @pytest.fixture(scope='session')
-def pg_server(host, unused_port, container_starter):
+def pg_server(unused_port, container_starter):
     tag = "9.6"
     image = 'postgres:{}'.format(tag)
 
@@ -123,7 +114,7 @@ def pg_server(host, unused_port, container_starter):
     params = dict(database='aiohttp_admin',
                   user='aiohttp_admin_user',
                   password='mysecretpassword',
-                  host=host,
+                  host='127.0.0.1',
                   port=host_port)
 
     def connect():
@@ -143,7 +134,7 @@ def mysql_params(mysql_server):
 
 
 @pytest.fixture(scope='session')
-def mysql_server(host, unused_port, container_starter):
+def mysql_server(unused_port, container_starter):
     tag = '5.7'
     image = 'mysql:{}'.format(tag)
 
@@ -160,7 +151,7 @@ def mysql_server(host, unused_port, container_starter):
     params = dict(database='aiohttp_admin',
                   user='aiohttp_admin_user',
                   password='mysecretpassword',
-                  host=host,
+                  host='127.0.0.1',
                   port=host_port)
 
     def connect():
@@ -181,7 +172,7 @@ def mongo_params(mongo_server):
 
 
 @pytest.fixture(scope='session')
-def mongo_server(host, unused_port, container_starter):
+def mongo_server(unused_port, container_starter):
     tag = '3.3'
     image = 'mongo:{}'.format(tag)
 
@@ -192,7 +183,7 @@ def mongo_server(host, unused_port, container_starter):
     container = container_starter(image, internal_port, host_port,
                                   volume=volume, command=command)
 
-    params = dict(host=host, port=host_port)
+    params = dict(host='127.0.0.1', port=host_port)
 
     def connect():
         client = pymongo.MongoClient(**params)