Skip to content

Commit

Permalink
Revert settings with "RTD_" prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
humitos committed Oct 30, 2019
1 parent 022136b commit 2b4aa84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions readthedocs/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,9 @@ def USE_PROMOS(self): # noqa
}

# Alias tagged via ``docker tag`` on the build servers
RTD_DOCKER_IMAGE_SETTINGS.update({
'readthedocs/build:stable': RTD_DOCKER_IMAGE_SETTINGS.get('readthedocs/build:4.0'),
'readthedocs/build:latest': RTD_DOCKER_IMAGE_SETTINGS.get('readthedocs/build:5.0'),
DOCKER_IMAGE_SETTINGS.update({
'readthedocs/build:stable': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:4.0'),
'readthedocs/build:latest': DOCKER_IMAGE_SETTINGS.get('readthedocs/build:5.0'),
})

# All auth
Expand Down
4 changes: 2 additions & 2 deletions readthedocs/settings/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ class DockerBaseSettings(CommunityDevSettings):

"""Settings for local development with Docker"""

RTD_DOCKER_ENABLE = True
DOCKER_ENABLE = True
RTD_DOCKER_COMPOSE = True
RTD_DOCKER_COMPOSE_VOLUME = 'readthedocsorg_build-user-builds'
RTD_DOCKER_USER = f'{os.geteuid()}:{os.getegid()}'
RTD_DOCKER_LIMITS = {'memory': '1g', 'time': 900}
DOCKER_LIMITS = {'memory': '1g', 'time': 900}
USE_SUBDOMAIN = True
STATIC_URL = 'http://dev.readthedocs.io/devstoreaccount1/static/'

Expand Down

0 comments on commit 2b4aa84

Please sign in to comment.