Merge remote-tracking branch 'origin/master'

This commit is contained in:
John Washam
2016-10-18 10:31:17 -07:00
3 changed files with 11 additions and 3 deletions

View File

@@ -6,6 +6,10 @@ WORKDIR /src
RUN pip install flask gunicorn \
&& cp cards-jwasham.db cards.db
CMD ["gunicorn", "--bind", " 0.0.0.0:8000", "flash_cards:app"]
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
EXPOSE 8000
CMD ["/entrypoint.sh"]

View File

@@ -1,3 +1,3 @@
SECRET_KEY='some very long key here'
USERNAME='username-here'
PASSWORD='password-here'
USERNAME='username-test'
PASSWORD='password-test'

4
entrypoint.sh Normal file
View File

@@ -0,0 +1,4 @@
#!/bin/bash
export CARDS_SETTINGS=/src/config.txt
gunicorn --bind 0.0.0.0:8000 flash_cards:app