Skip to content

Commit 8a95acd

Browse files
committed
fix
1 parent 9b05716 commit 8a95acd

3 files changed

Lines changed: 37 additions & 19 deletions

File tree

app/Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
FROM ubuntu:14.04
66
MAINTAINER Gevin <flyhigher139@gmail.com>
77
# ADD sources.list /etc/apt/sources.list
8-
RUN apt-get update && apt-get install -y curl wget tar bzip2 unzip vim && \
9-
apt-get install -y nginx git build-essential python-dev python-pip && \
8+
9+
RUN apt-get update && apt-get install -y vim && \
10+
apt-get install -y nginx build-essential python-dev python-pip && \
1011
apt-get clean all
12+
1113
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
12-
# RUN pip install supervisor uwsgi -i http://pypi.douban.com/simple
13-
RUN pip install supervisor gunicorn
14+
RUN pip install -U pip
15+
RUN pip install --no-cache-dir supervisor gunicorn
1416
ADD supervisord.conf /etc/supervisord.conf
1517
RUN mkdir -p /etc/supervisor.conf.d && \
1618
mkdir -p /var/log/supervisor
1719
RUN mkdir -p /usr/src/app && mkdir -p /var/log/gunicorn
1820
WORKDIR /usr/src/app
1921
ADD requirements.txt /usr/src/app/requirements.txt
20-
RUN pip install -r /usr/src/app/requirements.txt
22+
RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt
2123

2224
COPY . /usr/src/app
2325
RUN ln -s /usr/src/app/octblog_nginx.conf /etc/nginx/sites-enabled

app/requirements.txt

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
flask
2-
flask-script
3-
flask-login
4-
flask-admin
5-
Flask-WTF
6-
flask-principal
7-
WTForms
8-
mongoengine
9-
flask_mongoengine
10-
markdown2
11-
bleach
12-
python-dateutil
13-
requests
1+
appdirs==1.4.0
2+
bleach==1.5.0
3+
blinker==1.4
4+
click==6.7
5+
Flask==0.12
6+
Flask-Admin==1.4.2
7+
Flask-Login==0.4.0
8+
flask-mongoengine==0.9.2
9+
Flask-Principal==0.4.0
10+
Flask-Script==2.0.5
11+
Flask-WTF==0.14.2
12+
html5lib==0.9999999
13+
itsdangerous==0.24
14+
Jinja2==2.9.5
15+
markdown2==2.3.3
16+
MarkupSafe==0.23
17+
mongoengine==0.11.0
18+
packaging==16.8
19+
pymongo==3.4.0
20+
pyparsing==2.1.10
21+
python-dateutil==2.6.0
22+
requests==2.13.0
23+
six==1.10.0
24+
Werkzeug==0.11.15
25+
WTForms==2.1

docker-compose.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ version: '2'
22
services:
33
blog:
44
# restart: always
5-
image: gevin/octblog
5+
image: gevin/octblog:0.1.2
66
ports:
77
- "8000:8000"
8+
# - "5000:5000"
89
links:
910
- mongo:mongo
1011
env_file: .env
@@ -16,3 +17,6 @@ services:
1617
volumes:
1718
- /Users/gevin/projects/data/mongodb:/data/db
1819

20+
# ports:
21+
# - "27017:27017"
22+

0 commit comments

Comments
 (0)