Skip to content

Commit

Permalink
Updating sample dockerfile and fixing an error in the README.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Wayne Parrott committed Nov 13, 2015
1 parent 8cc4514 commit 21ddce1
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.rst
Expand Up @@ -240,5 +240,7 @@ Licensing
.. _CONTRIBUTING.md: https://github.com/GoogleCloudPlatform/talisman/blob/master/CONTRIBUTING.md
.. |Build Status| image:: https://travis-ci.org/GoogleCloudPlatform/talisman.svg
:target: https://travis-ci.org/GoogleCloudPlatform/talisman
.. |Coverage Status| image:: https://coveralls.io/repos/GoogleCloudPlatform/flask-talisman/badge.svg
:target: https://coveralls.io/r/GoogleCloudPlatform/flask-talisman
.. |PyPI Version| image:: https://img.shields.io/pypi/v/talisman.svg
:target: https://pypi.python.org/pypi/talisman
13 changes: 11 additions & 2 deletions example_app/Dockerfile
@@ -1,3 +1,12 @@
FROM google/python-runtime
FROM gcr.io/google_appengine/python
RUN virtualenv /env -p python3.4

ENTRYPOINT /env/bin/gunicorn -c gunicorn.conf.py -b 0.0.0.0:8080 main:app
# Set virtualenv environment variables. This is equivalent to running
# source /env/bin/activate
ENV VIRTUAL_ENV /env
ENV PATH /env/bin:$PATH

ADD requirements.txt /app/
RUN pip install -r requirements.txt
ADD . /app/
CMD gunicorn -c gunicorn.conf.py -b :$PORT main:app
2 changes: 1 addition & 1 deletion example_app/app.yaml
@@ -1,3 +1,3 @@
runtime: custom
vm: true
api_version: 1
entrypoint: custom
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -25,10 +25,10 @@

version='0.1.0',

description='Sane defaults for Flask security.',
description='HTTP security headers for Flask.',
long_description=long_description,

url='https://github.com/GoogleCloudPlatorm/talisman',
url='https://github.com/GoogleCloudPlatform/flask-talisman',

author='Jon Wayne Parrott',
author_email='jonwayne@google.com',
Expand All @@ -48,6 +48,7 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',

'Operating System :: POSIX',
'Operating System :: MacOS',
Expand Down

0 comments on commit 21ddce1

Please sign in to comment.