From 9365df9d364200ba986a5868be37a20d8ced148a Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Fri, 29 Apr 2016 10:08:54 +0200 Subject: [PATCH] MT#7247 docker: add dev requirements to run django inside docker easily Change-Id: I7ca8507732f8e9f035d217ad7f2bc3b61f17d2d9 --- Makefile | 3 ++- t/Dockerfile | 8 +++++--- t/dev.txt | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 t/dev.txt diff --git a/Makefile b/Makefile index 2535355..7ddc303 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,8 @@ migrate: venv_prod ################################### run_dev: - ./manage.py runserver_plus --settings="repoapi.settings.dev" + IP=$(shell ip a show dev eth0 scope global | grep inet | awk '{print $$2}' | cut -d/ -f1); \ + ./manage.py runserver_plus $$IP:8000 --settings="repoapi.settings.dev" ################################### diff --git a/t/Dockerfile b/t/Dockerfile index 4aa291d..80d3ee0 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -5,14 +5,14 @@ FROM docker.mgm.sipwise.com/sipwise-jessie: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 2016-01-12 +ENV REFRESHED_AT 2016-04-29 RUN apt-get update RUN apt-get install --assume-yes python2.7 python2.7-dev python-distribute python-pip git # Get pip to download and install requirements: -COPY test.txt common.txt /tmp/ -RUN pip install -r /tmp/test.txt +COPY dev.txt test.txt common.txt /tmp/ +RUN pip install -r /tmp/dev.txt RUN echo './t/testrunner' >>/root/.bash_history @@ -32,4 +32,6 @@ WORKDIR /code/ # Inside docker (the command is in history, just press UP button): # ./t/testrunner # +# Run django inside docker: +# make run_dev ################################################################################ diff --git a/t/dev.txt b/t/dev.txt new file mode 100644 index 0000000..fc64438 --- /dev/null +++ b/t/dev.txt @@ -0,0 +1,2 @@ +-r test.txt +Werkzeug