diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 12 | ||||
| -rw-r--r-- | docker/Dockerfile-django-1.5.12-jessie | 26 | ||||
| -rw-r--r-- | docker/backports.list | 1 | ||||
| -rw-r--r-- | docker/requirements.txt | 2 | ||||
| -rw-r--r-- | docker/requirements.txt.dj-1.5.12 | 7 |
5 files changed, 45 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 2fcb51c..c11a8b0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,10 @@ -FROM python:2.7-jessie +FROM python:2.7-stretch -RUN apt-get -y update && apt-get install -y mercurial fonts-freefont-ttf survex locales +#COPY backports.list /etc/apt/sources.list.d/ + +RUN apt-get -y update && apt-get install -y mercurial fonts-freefont-ttf locales survex + +#RUN apt-get -y -t -backports install survex # Set the locale RUN locale-gen en_GB.UTF-8 @@ -11,8 +15,12 @@ ENV LC_ALL en_GB.UTF-8 WORKDIR /opt/expo/troggle COPY requirements.txt . +RUN pip install --upgrade pip + RUN pip install -r requirements.txt EXPOSE 8000 +WORKDIR /expo/troggle + #CMD ["python","manage.py","runserver","0.0.0.0:8000"]
\ No newline at end of file diff --git a/docker/Dockerfile-django-1.5.12-jessie b/docker/Dockerfile-django-1.5.12-jessie new file mode 100644 index 0000000..2cf1a51 --- /dev/null +++ b/docker/Dockerfile-django-1.5.12-jessie @@ -0,0 +1,26 @@ +FROM python:2.7-jessie + +COPY backports.list /etc/apt/sources.list.d/ + +RUN apt-get -y update && apt-get install -y mercurial fonts-freefont-ttf locales + +RUN apt-get -y -t jessie-backports install survex + +# Set the locale +RUN locale-gen en_GB.UTF-8 +ENV LANG en_GB.UTF-8 +ENV LANGUAGE en_GB:en +ENV LC_ALL en_GB.UTF-8 + +WORKDIR /opt/expo/troggle +COPY requirements.txt . + +RUN pip install --upgrade pip + +RUN pip install -r requirements.txt + +EXPOSE 8000 + +WORKDIR /expo/troggle + +#CMD ["python","manage.py","runserver","0.0.0.0:8000"]
\ No newline at end of file diff --git a/docker/backports.list b/docker/backports.list new file mode 100644 index 0000000..c29532b --- /dev/null +++ b/docker/backports.list @@ -0,0 +1 @@ +deb http://ftp.debian.org/debian jessie-backports main
\ No newline at end of file diff --git a/docker/requirements.txt b/docker/requirements.txt index 9f9b5ae..b26bc10 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -1,4 +1,4 @@ -Django==1.5.12 +Django==1.6.11 django-registration==1.0 mysql imagekit diff --git a/docker/requirements.txt.dj-1.5.12 b/docker/requirements.txt.dj-1.5.12 new file mode 100644 index 0000000..9f9b5ae --- /dev/null +++ b/docker/requirements.txt.dj-1.5.12 @@ -0,0 +1,7 @@ +Django==1.5.12 +django-registration==1.0 +mysql +imagekit +Image +django-tinymce==1.5.3 +smartencoding |