Merge pull request #6471 from readthedocs/humitos/common-tasks

Use tasks from common (including docker ones)

Author: humitos

common

@@ -49,8 +49,8 @@ services:
   proxito:
     image: readthedocsorg_server:latest
     volumes:
-      - ${PWD}/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
-      - ${PWD}/dockerfiles/entrypoints/proxito.sh:/usr/src/app/docker/proxito.sh
+      - ${PWD}/common/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
+      - ${PWD}/common/dockerfiles/entrypoints/proxito.sh:/usr/src/app/docker/proxito.sh
       - ${PWD}:/usr/src/app/checkouts/readthedocs.org
       - ${PWD}/../readthedocs-ext:/usr/src/app/checkouts/readthedocs-ext
       - ${PWD}/dockerfiles/settings/proxito.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/proxito.py
@@ -75,9 +75,9 @@ services:
   web:
     image: readthedocsorg_server:latest
     volumes:
-      - ${PWD}/dockerfiles/scripts/createsuperuser.py:/usr/src/app/docker/createsuperuser.py
-      - ${PWD}/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
-      - ${PWD}/dockerfiles/entrypoints/web.sh:/usr/src/app/docker/web.sh
+      - ${PWD}/common/dockerfiles/scripts/createsuperuser.py:/usr/src/app/docker/createsuperuser.py
+      - ${PWD}/common/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
+      - ${PWD}/common/dockerfiles/entrypoints/web.sh:/usr/src/app/docker/web.sh
       - ${PWD}/../readthedocs-ext:/usr/src/app/checkouts/readthedocs-ext
       - ${PWD}:/usr/src/app/checkouts/readthedocs.org
       - ${PWD}/dockerfiles/settings/web.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/web.py
@@ -105,9 +105,9 @@ services:
   celery:
     image: readthedocsorg_server:latest
     volumes:
-      - ${PWD}/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
-      - ${PWD}/dockerfiles/entrypoints/celery.sh:/usr/src/app/docker/celery.sh
-      - ${PWD}/dockerfiles/scripts/wait_for_search.py:/usr/src/app/docker/scripts/wait_for_search.py
+      - ${PWD}/common/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
+      - ${PWD}/common/dockerfiles/entrypoints/celery.sh:/usr/src/app/docker/celery.sh
+      - ${PWD}/common/dockerfiles/scripts/wait_for_search.py:/usr/src/app/docker/scripts/wait_for_search.py
       - ${PWD}/../readthedocs-ext:/usr/src/app/checkouts/readthedocs-ext
       - ${PWD}:/usr/src/app/checkouts/readthedocs.org
       - ${PWD}/dockerfiles/settings/celery.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/celery.py
@@ -130,8 +130,8 @@ services:
   build:
     image: readthedocsorg_server:latest
     volumes:
-      - ${PWD}/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
-      - ${PWD}/dockerfiles/entrypoints/build.sh:/usr/src/app/docker/build.sh
+      - ${PWD}/common/dockerfiles/entrypoints/common.sh:/usr/src/app/docker/common.sh
+      - ${PWD}/common/dockerfiles/entrypoints/build.sh:/usr/src/app/docker/build.sh
       - ${PWD}/../readthedocs-ext:/usr/src/app/checkouts/readthedocs-ext
       - ${PWD}:/usr/src/app/checkouts/readthedocs.org
       - ${PWD}/dockerfiles/settings/build.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/build.py
@@ -171,7 +171,7 @@ services:
   azure-cli:
     image: microsoft/azure-cli
     volumes:
-      - ${PWD}/dockerfiles/scripts/create-containers.sh:/usr/local/bin/create-containers.sh
+      - ${PWD}/common/dockerfiles/scripts/create-containers.sh:/usr/local/bin/create-containers.sh
     links:
       - storage
     depends_on:

docker-compose.yml

@@ -1,13 +1,11 @@
 """Read the Docs tasks."""
 
-from __future__ import division, print_function, unicode_literals
-
 import os
 
 from invoke import task, Collection
 
 import common.tasks
-import dockerfiles.tasks
+import common.dockerfiles.tasks
 
 
 ROOT_PATH = os.path.dirname(__file__)
@@ -37,16 +35,11 @@
 )
 
 namespace.add_collection(
-    Collection(
-        dockerfiles.tasks.build,
-        dockerfiles.tasks.down,
-        dockerfiles.tasks.up,
-        dockerfiles.tasks.shell,
-        dockerfiles.tasks.manage,
-        dockerfiles.tasks.attach,
-        dockerfiles.tasks.restart,
-        dockerfiles.tasks.pull,
-        dockerfiles.tasks.test,
+    Collection.from_module(
+        common.dockerfiles.tasks,
+        config={
+            'container_prefix': 'readthedocsorg',
+        },
     ),
     name='docker',
 )