Skip to content
This repository was archived by the owner on Jan 7, 2026. It is now read-only.

Commit 18a8bff

Browse files
New version of image, fix and update requirements
1 parent 4cb9c9e commit 18a8bff

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM python:3.6.5-stretch
2+
3+
VOLUME [ "/puppenc" ]
4+
5+
WORKDIR /puppenc
6+
7+
8+
COPY requirements.txt .
9+
10+
RUN pip install -r requirements.txt
11+
12+
WORKDIR "/puppenc"

docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
version: '2'
33
services:
44
puppenc-api:
5-
#image: puppenc/api:latest
6-
image: puppenc/api:v2
5+
image: puppenc/api:latest
76
restart: always
87
ports:
98
- "5000:5000"
@@ -16,7 +15,7 @@ services:
1615
- python
1716
- run.py
1817
environment:
19-
PUPPENC_SETTINGS: 'config.py'
18+
PUPPENC_SETTINGS: 'config.py'
2019
puppenc-mysql:
2120
image: mysql:5.6
2221
ports:

requirements.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@ Flask-HTTPAuth==3.2.3
55
flask-marshmallow==0.9.0
66
Flask-RESTful==0.3.6
77
Flask-SQLAlchemy==2.3.2
8+
future==0.16.0
9+
gevent==1.3.6
10+
greenlet==0.4.15
11+
gunicorn==19.9.0
812
itsdangerous==0.24
9-
Jinja2==2.10
13+
Jinja2==2.10.1
1014
MarkupSafe==1.0
1115
marshmallow==2.15.2
1216
marshmallow-sqlalchemy==0.13.2
1317
mysqlclient==1.3.12
1418
passlib==1.7.1
19+
pycurl==7.43.0.1
20+
pyresttest==1.7.1
1521
pytz==2018.4
16-
PyYAML==3.12
22+
PyYAML==5.1
1723
six==1.11.0
18-
SQLAlchemy==1.2.7
24+
SQLAlchemy==1.3.3
1925
Werkzeug==0.14.1
20-
gunicorn==19.9.0
21-
gevent==1.3.6

tests/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
version: '2'
33
services:
44
puppenc-api-tests:
5-
image: puppenc/api:v2
5+
image: puppenc/latest
66
restart: always
77
ports:
88
- "5005:5000"

0 commit comments

Comments
 (0)