Skip to content

Commit 488f4cc

Browse files
authored
Merge pull request #5 from python-microservices/feature/changes-dockerfile
- Updated Dockerfile
2 parents 55afc19 + fa6ad1d commit 488f4cc

6 files changed

+25
-6
lines changed

.coveragerc

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[run]
22
include=
33
*project/*
4-
*pyms/*
54
omit =
65
venv/*

Dockerfile

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
FROM python:3.6.4-alpine3.7
22

3-
RUN apk add --update curl gcc g++ git libffi-dev openssl-dev python3-dev \
3+
RUN apk add --update curl gcc g++ git libffi-dev openssl-dev python3-dev build-base linux-headers \
44
&& rm -rf /var/cache/apk/*
55
RUN ln -s /usr/include/locale.h /usr/include/xlocale.h
66

77
ENV PYTHONUNBUFFERED=1 ENVIRONMENT=pre APP_HOME=/microservice/
8-
RUN mkdir $APP_HOME && adduser -S -D -H python
8+
ENV DATABASE_DIR=database
9+
ENV CONFIGMAP_FILE="$APP_HOME"config-docker.yml
910

11+
RUN mkdir $APP_HOME && adduser -S -D -H python
1012
RUN chown -R python $APP_HOME
1113
WORKDIR $APP_HOME
14+
1215
ADD requirement*.txt $APP_HOME
16+
RUN pip install --upgrade pip
1317
RUN pip install -r requirements-docker.txt
18+
1419
ADD . $APP_HOME
20+
RUN mkdir $DATABASE_DIR
21+
RUN chmod 777 $DATABASE_DIR
1522

1623
EXPOSE 5000
1724
USER python

config-docker.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
ms:
2+
DEBUG: false
3+
TESTING: false
4+
APP_NAME: Template
5+
APPLICATION_ROOT : /template
6+
SQLALCHEMY_TRACK_MODIFICATIONS: true
7+
SECRET_KEY: "gjr39dkjn344_!67#"
8+
DATABASE: db.sqlite3
9+
SQLALCHEMY_DATABASE_URI: sqlite:////microservice/database/db.sqlite3

config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ms:
66
SQLALCHEMY_TRACK_MODIFICATIONS: true
77
SECRET_KEY: "gjr39dkjn344_!67#"
88
DATABASE: db.sqlite3
9-
SQLALCHEMY_DATABASE_URI: sqlite:///db.sqlite3
9+
SQLALCHEMY_DATABASE_URI: sqlite:////microservice/database/db.sqlite3

requirements-docker.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-r requirements.txt
22
gevent==1.3.7
33
gunicorn==19.9.0
4+
psutil==5.4.8

requirements.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
Flask-SQLAlchemy==2.3.2
2-
py-ms==0.1.1
3-
SQLAlchemy==1.2.14
2+
SQLAlchemy==1.2.14
3+
Flask-Script==2.0.6
4+
# py-ms==0.1.1
5+
git+https://github.com/python-microservices/pyms.git@master#egg=py-ms
6+
connexion[swagger-ui]==2.0.1

0 commit comments

Comments
 (0)