diff --git a/README.md b/README.md index 1776103..72ec146 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,19 @@ go away! This is on pre-alpha^4 development stage. Run docker containers --------------------- - $ docker run --rm --hostname repoapi-rabbit --name repoapi-rabbit rabbitmq:3 + $ docker run -d --rm --hostname repoapi-rabbit --name repoapi-rabbit rabbitmq:3 $ docker run --rm -i -t --link repoapi-rabbit:rabbit -v $(pwd):/code:rw docker.mgm.sipwise.com/repoapi-buster:latest bash +Tmux +---- + +Use tmux inside repoapi-buster container so you can execute both dev server and worker + +``` +$ docker run --rm -i -t --link repoapi-rabbit:rabbit --env=VAR_DIR=/code -v $(pwd):/code:rw docker.mgm.sipwise.com/repoapi-buster:latest tmux +``` +or just execute ``./tmux.sh`` + Prepare development environment =============================== @@ -32,7 +42,7 @@ Inside the repoapi-buster container run: ``` $ make venv_dev - $ source /var/lib/repoapi/venv_dev/bin/activate + $ source $(VAR_DIR)/venv_dev/bin/activate (venv_dev)$ ``` @@ -56,11 +66,6 @@ Create superuser (venv_dev)$ ./manage.py createsuperuser --settings="repoapi.settings.dev" ``` -Tmux ----- - -Use tmux inside repoapi-buster container so you can execute both dev server and worker - Run dev server -------------- diff --git a/repoapi/settings/common.py b/repoapi/settings/common.py index fd5010c..dc48d16 100644 --- a/repoapi/settings/common.py +++ b/repoapi/settings/common.py @@ -30,6 +30,7 @@ PROJECT_APPS = [ ] INSTALLED_APPS = [ + "object_tools", "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", @@ -44,6 +45,7 @@ INSTALLED_APPS = [ "django_extensions", "django_filters", "jsonify", + "export", ] MIDDLEWARE_CLASSES = ( diff --git a/repoapi/urls.py b/repoapi/urls.py index d05dc59..f6666f3 100644 --- a/repoapi/urls.py +++ b/repoapi/urls.py @@ -9,6 +9,7 @@ # more details. # You should have received a copy of the GNU General Public License along # with this program. If not, see . +import object_tools from django.conf.urls import include from django.conf.urls import url from django.contrib import admin @@ -92,6 +93,7 @@ api_patterns = [ api_patterns = format_suffix_patterns(api_patterns) urlpatterns = [ + url(r"^object-tools/", include(object_tools.tools.urls)), url(r"^admin/", include(admin.site.urls)), url(r"^", include(api_patterns)), url( diff --git a/requirements/common.txt b/requirements/common.txt index 387deac..f0373fc 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -1,12 +1,15 @@ celery Django==1.11.28 django-assets -django-celery-beat +django-celery-beat<2.0 django-celery-results +django-export django-extensions django-filter django-jsonify +django-object-tools django-rest-swagger +django-timezone-field>=3.1,<4.0 # last version supporting django 1.11 djangorestframework>=3.6,<3.7 drfapikey flower diff --git a/t/Dockerfile b/t/Dockerfile index 89952a1..56d2463 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -5,7 +5,7 @@ FROM docker.mgm.sipwise.com/sipwise-buster:latest # is updated with the current date. It will force refresh of all # of the base images and things like `apt-get update` won't be using # old cached versions when the Dockerfile is built. -ENV REFRESHED_AT 2020-02-21 +ENV REFRESHED_AT 2020-03-06 RUN apt-get update RUN apt-get install --assume-yes python3 python3-dev \ diff --git a/tmux.sh b/tmux.sh new file mode 100755 index 0000000..383dd17 --- /dev/null +++ b/tmux.sh @@ -0,0 +1,7 @@ +#!/bin/bash +docker run -d --rm \ + --hostname repoapi-rabbit --name repoapi-rabbit rabbitmq:3 +docker pull docker.mgm.sipwise.com/repoapi-buster:latest +docker run --rm -i -t --env=VAR_DIR=/code --link repoapi-rabbit:rabbit \ + -v "$(pwd)":/code:rw docker.mgm.sipwise.com/repoapi-buster:latest tmux +docker stop repoapi-rabbit