Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(bump-image) #5

Merged
merged 1 commit into from
Jun 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions {{cookiecutter.package_name}}/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# To check running container: docker exec -it {{ cookiecutter.package_name }} /bin/bash


FROM quay.io/cdis/python-nginx:1.3.0
FROM quay.io/cdis/python-nginx:pybase3-1.0.0


ENV appname={{ cookiecutter.package_name }}
Expand All @@ -18,8 +18,6 @@ RUN apk update \
COPY . /$appname
COPY ./deployment/uwsgi/uwsgi.ini /etc/uwsgi/uwsgi.ini
COPY ./deployment/uwsgi/wsgi.py /$appname/wsgi.py
COPY ./deployment/nginx/nginx.conf /etc/nginx/
COPY ./deployment/nginx/uwsgi.conf /etc/nginx/conf.d/nginx.conf
WORKDIR /$appname

RUN python -m pip install --upgrade pip \
Expand All @@ -43,4 +41,4 @@ RUN COMMIT=`git rev-parse HEAD` && echo "COMMIT=\"${COMMIT}\"" >$appname/version

WORKDIR /var/www/$appname

CMD /$appname/dockerrun.bash
CMD /dockerrun.sh
57 changes: 0 additions & 57 deletions {{cookiecutter.package_name}}/deployment/nginx/nginx.conf

This file was deleted.

34 changes: 0 additions & 34 deletions {{cookiecutter.package_name}}/deployment/nginx/uwsgi.conf

This file was deleted.

7 changes: 4 additions & 3 deletions {{cookiecutter.package_name}}/deployment/uwsgi/uwsgi.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[uwsgi]
protocol = uwsgi
socket = /var/www/{{ cookiecutter.package_name }}/uwsgi.sock
socket = /var/run/gen3/uwsgi.sock
buffer-size = 32768
uid = nginx
gid = nginx
chown-socket = nginx:nginx
chmod-socket = 666
master = true
harakiri-verbose = 20
Expand All @@ -10,8 +13,6 @@ wsgi-file=/{{ cookiecutter.package_name }}/wsgi.py
plugins = python3
vacuum = true
chdir = /{{ cookiecutter.package_name }}/
uid = nginx
gid = nginx
pythonpath = /usr/local/lib/python3.6/site-packages/


Expand Down
30 changes: 0 additions & 30 deletions {{cookiecutter.package_name}}/dockerrun.bash

This file was deleted.