Skip to content

Commit 9760280

Browse files
committed
fix docs in docker
1 parent 4bc4a2a commit 9760280

File tree

5 files changed

+21
-37
lines changed

5 files changed

+21
-37
lines changed

docs/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ RUN pip install --upgrade pip
1818
# Install IDOM
1919
# ------------
2020
ADD requirements ./requirements
21+
RUN pip install -r requirements/build-docs.txt
22+
2123
ADD src ./src
2224
ADD scripts ./scripts
2325
ADD setup.py ./
2426
ADD setup.cfg ./
2527
ADD MANIFEST.in ./
2628
ADD README.md ./
27-
2829
RUN pip install -e .[all]
2930

3031
# Add License
@@ -38,9 +39,7 @@ ADD docs/app.py ./docs/
3839
ADD docs/examples.py ./docs/
3940
ADD docs/source ./docs/source
4041
ADD branding ./branding
41-
42-
RUN pip install -r requirements/build-docs.txt
43-
RUN sphinx-build -W -b html docs/source docs/build
42+
RUN sphinx-build -v -W -b html docs/source docs/build
4443

4544
# Define Entrypoint
4645
# -----------------

docs/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
from .app import run
2-
3-
4-
__all__ = ["run"]

docs/app.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import os
21
from logging import getLogger
32
from pathlib import Path
43

@@ -20,23 +19,6 @@
2019
IDOM_MODEL_SERVER_URL_PREFIX = "/_idom"
2120

2221

23-
def run():
24-
app = make_app()
25-
26-
configure(
27-
app,
28-
Example,
29-
Options(url_prefix=IDOM_MODEL_SERVER_URL_PREFIX),
30-
)
31-
32-
app.run(
33-
host="0.0.0.0",
34-
port=int(os.environ.get("PORT", 5000)),
35-
workers=int(os.environ.get("WEB_CONCURRENCY", 1)),
36-
debug=bool(int(os.environ.get("DEBUG", "0"))),
37-
)
38-
39-
4022
@component
4123
def Example():
4224
raw_view_id = use_request().get_args().get("view_id")
@@ -67,4 +49,10 @@ def make_app():
6749
async def forward_to_index(request):
6850
return response.redirect("/docs/index.html")
6951

52+
configure(
53+
app,
54+
Example,
55+
Options(url_prefix=IDOM_MODEL_SERVER_URL_PREFIX),
56+
)
57+
7058
return app

scripts/live_docs.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
get_parser,
1414
)
1515

16-
from docs.app import IDOM_MODEL_SERVER_URL_PREFIX, Example, make_app, reload_examples
17-
from idom.backend.sanic import Options, configure, serve_development_app
16+
from docs.app import make_app, reload_examples
17+
from idom.backend.sanic import serve_development_app
1818
from idom.testing import clear_idom_web_modules_dir
1919

2020

@@ -30,12 +30,6 @@ def wrap_builder(old_builder):
3030

3131
app = make_app()
3232

33-
configure(
34-
app,
35-
Example,
36-
Options(cors=True, url_prefix=IDOM_MODEL_SERVER_URL_PREFIX),
37-
)
38-
3933
thread_started = threading.Event()
4034

4135
def run_in_thread():

scripts/run_docs.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@
66
# to import docs
77
sys.path.insert(0, os.getcwd())
88

9+
from docs.app import make_app
910

10-
if __name__ == "__main__":
11-
from docs import run
1211

13-
run()
12+
app = make_app()
13+
14+
if __name__ == "__main__":
15+
app.run(
16+
host="0.0.0.0",
17+
port=int(os.environ.get("PORT", 5000)),
18+
workers=int(os.environ.get("WEB_CONCURRENCY", 1)),
19+
debug=bool(int(os.environ.get("DEBUG", "0"))),
20+
)

0 commit comments

Comments
 (0)