From 8fe3e1cf41f8469b2b89ea6d75929aa83a3fac13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9lia=20Prat?= Date: Fri, 8 Sep 2023 16:12:00 +0200 Subject: [PATCH] Ease quickstart for developers --- CHANGES.md | 1 + Dockerfile | 6 +++++- docker/entrypoint.sh | 7 +++++++ docs/development.rst | 7 +++++-- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100755 docker/entrypoint.sh diff --git a/CHANGES.md b/CHANGES.md index 86631329e..3e73b8a6f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ CHANGELOG * Support django 4.2 and python 3.11 * Drop django 3.1 support +* Ease quickstart for developers 8.5.6 (2023-09-04) diff --git a/Dockerfile b/Dockerfile index 79fd2305b..a33aad075 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,8 @@ RUN /code/venv/bin/pip install --no-cache-dir pip setuptools wheel -U # Install dev requirements RUN /code/venv/bin/pip3 install --no-cache-dir -e .[dev] -U -CMD ["/code/venv/bin/python3.8", "manage.py", "runserver", "0.0.0.0:8000"] +# Activate venv through entrypoint +COPY --chown=django:django docker/entrypoint.sh /usr/local/bin/entrypoint.sh +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] + +CMD ["manage.py", "runserver", "0.0.0.0:8000"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100755 index 000000000..f1c59cd6a --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Activate venv +. /code/venv/bin/activate + +# exec +exec "$@" diff --git a/docs/development.rst b/docs/development.rst index fcc4f3058..c03ae09fe 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -1,9 +1,12 @@ Development =========== -Follow installation procedure, and then install development packages:: +Quickstart to run MapEntity in development : - $ pip install -r dev-requirements.txt + $ docker-compose build + $ docker-compose run --rm web ./manage.py migrate + $ docker-compose run --rm web ./manage.py createsuperuser + $ docker-compose up Release