Skip to content

Commit aa1df75

Browse files
committedMar 8, 2015
Give up
1 parent 845da0d commit aa1df75

File tree

5 files changed

+9
-20
lines changed

5 files changed

+9
-20
lines changed
 

‎.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.git
2+
.coverage

‎Dockerfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
FROM ubuntu:14.04
2-
3-
COPY ./requirements.txt /opt/minicomi/requirements.txt
4-
COPY ./docker/install.sh /opt/minicomi/docker/install.sh
5-
WORKDIR /opt/minicomi
1+
FROM python:3.4.3
62

73
ENV DJANGO_SETTINGS_MODULE=minicomi.settings.production
84
ENV MINICOMI_DATABASE_NAME=minicomi
95
ENV MINICOMI_DATABASE_USER=minicomi
106

11-
RUN docker/install.sh
7+
COPY ./requirements.txt /opt/minicomi/requirements.txt
8+
WORKDIR /opt/minicomi
9+
10+
RUN pip install -r requirements.txt
1211

1312
COPY . /opt/minicomi
1413

15-
RUN docker/post-install.sh
14+
RUN python manage.py collectstatic --noinput
1615

1716
EXPOSE 5000
1817

‎docker/install.sh

-9
This file was deleted.

‎docker/post-install.sh

-3
This file was deleted.

‎docker/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767

6868
if [ "$1" = 'start' ];
6969
then
70-
python3 manage.py migrate
70+
python manage.py migrate
7171

7272
exec gunicorn \
7373
--workers=2 \

0 commit comments

Comments
 (0)