Skip to content

Use tasks from common (including docker ones) #6471

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jan 6, 2020
Merged

Use tasks from common (including docker ones) #6471

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
091bcf7
Use tasks from common (including docker ones)
humitos Dec 18, 2019
c286354
Use scripts and entrypoints from shared common repository
humitos Dec 18, 2019
2fa8267
Allow to extend docker.attach for corporate
humitos Dec 18, 2019
36bfe87
Merge branch 'master' of github.com:readthedocs/readthedocs.org into …
humitos Jan 6, 2020
efafe17
Update common repository
humitos Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 12 files
+0 −0 dockerfiles/__init__.py
+22 −0 dockerfiles/entrypoints/build.sh
+24 −0 dockerfiles/entrypoints/celery.sh
+7 −0 dockerfiles/entrypoints/common.sh
+14 −0 dockerfiles/entrypoints/proxito.sh
+23 −0 dockerfiles/entrypoints/web.sh
+3 −0 dockerfiles/requirements.txt
+5 −0 dockerfiles/scripts/create-containers.sh
+4 −0 dockerfiles/scripts/createsuperuser.py
+20 −0 dockerfiles/scripts/wait_for_search.py
+86 −0 dockerfiles/tasks.py
+8 −3 tasks.py
22 changes: 11 additions & 11 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,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
Expand All @@ -56,9 +56,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
Expand All @@ -80,9 +80,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
Expand All @@ -103,8 +103,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
Expand Down Expand Up @@ -140,7 +140,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:
Expand Down
23 changes: 0 additions & 23 deletions dockerfiles/entrypoints/build.sh
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions dockerfiles/entrypoints/celery.sh
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions dockerfiles/entrypoints/common.sh
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions dockerfiles/entrypoints/proxito.sh
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions dockerfiles/entrypoints/web.sh
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions dockerfiles/scripts/create-containers.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions dockerfiles/scripts/createsuperuser.py
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions dockerfiles/scripts/wait_for_search.py
View file
Open in desktop

This file was deleted.

86 changes: 0 additions & 86 deletions dockerfiles/tasks.py
View file
Open in desktop

This file was deleted.

19 changes: 6 additions & 13 deletions tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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__)
Expand Down Expand Up @@ -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',
)
Expand Down