Merge branch 'master' into humitos/django-upgrade-2.2

Author: humitos

.dockerignore

@@ -1,37 +1,3 @@
-common
-logs
-bower_components
-
-.git
-*.db*
-*.sql
-.tox
-.cache
-.pytest_cache
-celerybeat*
-debug.log
-
-**/__pycache__
-
-bower_components
-contrib
-datasets
-docs
-docker/azurite
-docker/search
-media/epub
-media/htmlzip
-media/json
-media/pdf
-node_modules
-private_cname_project
-private_cname_root
-private_web_root
-public_cname_project
-public_cname_root
-public_cnames
-public_symlinks
-public_web_root
-static
-spam-data
-user_builds
+# We only use the requirements folder in the Dockerfile
+*
+!requirements/

.env

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=community

.travis.yml

@@ -3,11 +3,7 @@ python:
   - 3.6
 dist: xenial
 
-env:
-  global:
-    - NODE_VERSION=10.17.0
-
-matrix:
+jobs:
   include:
     - python: 3.6
       env: TOXENV=py36,codecov ES_VERSION=6.2.4 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
@@ -19,7 +15,7 @@ matrix:
       env: TOXENV=lint
       script: tox
     - python: 3.6
-      env: TOXENV=eslint
+      env: TOXENV=eslint NODE_VERSION=10.17.0
     - python: 3.6
       env: TOXENV=migrations
 cache:
@@ -29,14 +25,8 @@ cache:
     - ~/.npm
 install:
   - ./scripts/travis/install_elasticsearch.sh
+  - ./scripts/travis/install_node.sh
   - pip install tox-travis
-  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
-  - source ~/.nvm/nvm.sh
-  - nvm install $NODE_VERSION
-  - nvm use $NODE_VERSION
-  - npm install -g bower
-  - npm install
-  - bower install
 script:
   - ./scripts/travis/run_tests.sh
 notifications:

AUTHORS.rst

@@ -1,7 +1,7 @@
 Read the Docs Team
 ==================
 
-The core Read the Docs team is described at http://docs.readthedocs.io/en/latest/team.html
+The core Read the Docs team is described at https://docs.readthedocs.io/en/latest/team.html
 
 Original Authors
 ===============

CHANGELOG.rst

@@ -12,7 +12,7 @@ Bazaar_, Git_, and Mercurial_ repositories.
 Then we build documentation and host it for you.
 Think of it as *Continuous Documentation*.
 
-.. _Read the docs: http://readthedocs.org/
+.. _Read the docs: https://readthedocs.org/
 .. _Sphinx: http://www.sphinx-doc.org/
 .. _reStructuredText: http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
 .. _Subversion: http://subversion.tigris.org/
@@ -36,7 +36,7 @@ You can find information about getting in touch with Read the Docs at our `Contr
 Contributing
 ------------
 
-You can find information about contributing to Read the Docs at our `Contribution page <http://docs.readthedocs.io/en/latest/contribute.html>`_.
+You can find information about contributing to Read the Docs at our `Contribution page <https://docs.readthedocs.io/en/latest/contribute.html>`_.
 
 Quickstart for GitHub-Hosted Projects
 -------------------------------------

README.rst

@@ -0,0 +1,90 @@
+# docker-compose.override.yml file to launch a full instance of Read the Docs.
+#
+# Read the Docs' Core team is using docker-compose internally.
+# We do not offer support on this file and configuration at this point.
+# DO NOT USE DOCKER-COMPOSE SETUP FOR PRODUCTION OR CUSTOM INSTALLATION.
+
+# We create this network here to be able to use a static IP for NGINX.
+# This is needed because hitting `community.dev.readthedocs.io` from
+# any service will fail since it will resolve to 127.0.0.1, but
+# instead we need to hit NGINX's IP (this is used on Embed API from
+# -ext for example) Setting a static IP for NGINX, allow us to
+# override /etc/hosts with this IP.
+version: '3'
+
+networks:
+  readthedocs:
+    driver: bridge
+    ipam:
+     config:
+       - subnet: 10.10.0.0/16
+
+services:
+
+  server:
+    build:
+      args:
+        GITHUB_TOKEN: ${GITHUB_TOKEN:-}
+
+  nginx:
+    networks:
+      readthedocs:
+        ipv4_address: 10.10.0.100
+
+  proxito:
+    image: community_server:latest
+    volumes:
+      - ${PWD}:/usr/src/app/checkouts/readthedocs.org
+      - ${PWD}/dockerfiles/settings/proxito.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/proxito.py
+    environment:
+      - DJANGO_SETTINGS_MODULE=readthedocs.settings.proxito
+
+  web:
+    image: community_server:latest
+    volumes:
+      - ${PWD}:/usr/src/app/checkouts/readthedocs.org
+      - ${PWD}/dockerfiles/settings/web.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/web.py
+    environment:
+      - DJANGO_SETTINGS_MODULE=readthedocs.settings.web
+    extra_hosts:
+      - "community.dev.readthedocs.io:10.10.0.100"
+
+  celery:
+    image: community_server:latest
+    volumes:
+      - ${PWD}:/usr/src/app/checkouts/readthedocs.org
+      - ${PWD}/dockerfiles/settings/celery.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/celery.py
+    environment:
+      - DJANGO_SETTINGS_MODULE=readthedocs.settings.celery
+      - CELERY_APP_NAME=readthedocs
+
+  build:
+    image: community_server:latest
+    volumes:
+      - ${PWD}:/usr/src/app/checkouts/readthedocs.org
+      - ${PWD}/dockerfiles/settings/build.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/build.py
+    environment:
+      - DJANGO_SETTINGS_MODULE=readthedocs.settings.build
+      - CELERY_APP_NAME=readthedocs
+
+  storage:
+    image: mcr.microsoft.com/azure-storage/azurite:latest
+    volumes:
+      - storage_data:/data
+    ports:
+      - "10000:10000"
+    networks:
+      readthedocs:
+    command: ["azurite-blob", "--silent", "--blobPort", "10000", "--blobHost", "0.0.0.0", "--location", "/data"]
+
+  azure-cli:
+    image: microsoft/azure-cli
+    volumes:
+      - ${PWD}/common/dockerfiles/scripts/create-containers.sh:/usr/local/bin/create-containers.sh
+    links:
+      - storage
+    depends_on:
+      - storage
+    networks:
+      readthedocs:
+    command: ["/usr/local/bin/create-containers.sh"]