Skip to content

Commit 120467e

Browse files
authored
New dashboard: remove old legacy dashboard settings (#266)
1 parent 3c0f0b8 commit 120467e

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

dockerfiles/docker-compose.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ services:
9494
- RTD_PUBLIC_DOMAIN
9595
- RTD_LOGGING_LEVEL
9696
- RTD_DJANGO_DEBUG
97-
- RTD_EXT_THEME_ENABLED
9897
- RTD_EXT_THEME_DEV_SERVER_ENABLED
9998
- RTD_FILETREEDIFF_ALL
10099
# AWS related settings.
@@ -137,7 +136,6 @@ services:
137136
environment:
138137
- INIT=${INIT:-}
139138
- DOCKER_NO_RELOAD
140-
- RTD_EXT_THEME_ENABLED
141139
- RTD_EXT_THEME_DEV_SERVER_ENABLED
142140
- RTD_PRODUCTION_DOMAIN
143141
- RTD_PUBLIC_DOMAIN
@@ -196,7 +194,6 @@ services:
196194
- INIT=${INIT:-}
197195
- DOCKER_NO_RELOAD
198196
- NODE_ENV=development
199-
- RTD_EXT_THEME_ENABLED
200197
- RTD_EXT_THEME_DEV_SERVER_ENABLED
201198
stdin_open: true
202199
tty: true
@@ -230,7 +227,6 @@ services:
230227
- COLUMNS=80
231228
- DOCKER_NO_RELOAD
232229
- CELERY_LOG_LEVEL=${CELERY_LOG_LEVEL:-INFO}
233-
- RTD_EXT_THEME_ENABLED
234230
- RTD_PRODUCTION_DOMAIN
235231
- RTD_PUBLIC_DOMAIN
236232
- RTD_LOGGING_LEVEL
@@ -279,7 +275,6 @@ services:
279275
environment:
280276
- DOCKER_NO_RELOAD
281277
- CELERY_LOG_LEVEL=${CELERY_LOG_LEVEL:-INFO}
282-
- RTD_EXT_THEME_ENABLED
283278
- RTD_PRODUCTION_DOMAIN
284279
- RTD_PUBLIC_DOMAIN
285280
- RTD_LOGGING_LEVEL
@@ -341,7 +336,6 @@ services:
341336
# If COLUMNS is not defined Celery fails at startup
342337
# https://github.com/celery/celery/issues/5761
343338
- COLUMNS=80
344-
- RTD_EXT_THEME_ENABLED
345339
- DOCKER_NO_RELOAD
346340
- CELERY_LOG_LEVEL=${CELERY_LOG_LEVEL:-INFO}
347341
- RTD_PRODUCTION_DOMAIN

dockerfiles/tasks.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,14 @@ def down(c, volumes=False):
6363
'reload': 'Enable automatic process reloading (default: True)',
6464
'build': 'Enable automatic building (default: False)',
6565
'detach': 'Detach mode: run containers in the background (default: False)',
66-
'legacy-dashboard': 'Use the old/legacy dashboard (default: False)',
6766
'scale-build': 'Add additional build instances (default: 1)',
6867
'http-domain': 'Configure a production domain for HTTP traffic. Subdomains included, '
6968
'example.dev implies *.examples.dev for proxito. Example: '
7069
'"17b5-139-47-118-243.ngrok.io"',
7170
'log-level': 'Logging level for the Django application (default: INFO)',
7271
'django-debug': 'Sets the DEBUG Django setting (default: True)',
7372
})
74-
def up(c, search=True, init=False, reload=True, build=False, detach=False, legacy_dashboard=False, scale_build=1, http_domain="", django_debug=True, log_level='INFO'):
73+
def up(c, search=True, init=False, reload=True, build=False, detach=False, scale_build=1, http_domain="", django_debug=True, log_level='INFO'):
7574
"""Start all the docker containers for a Read the Docs instance"""
7675
cmd = []
7776

@@ -86,9 +85,6 @@ def up(c, search=True, init=False, reload=True, build=False, detach=False, legac
8685

8786
if search:
8887
cmd.append(f'-f {DOCKER_COMPOSE_SEARCH}')
89-
if not legacy_dashboard:
90-
cmd.insert(0, 'RTD_EXT_THEME_DEV_SERVER_ENABLED=t')
91-
cmd.insert(0, 'RTD_EXT_THEME_ENABLED=t')
9288
if django_debug:
9389
cmd.insert(0, 'RTD_DJANGO_DEBUG=t')
9490
if http_domain:

0 commit comments

Comments
 (0)