chore(bump-image)

uc-cdis · Jun 7, 2019 · 495c9e0 · 495c9e0
1 parent 5a87f81
commit 495c9e0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 128 deletions.
diff --git a/{{cookiecutter.package_name}}/Dockerfile b/{{cookiecutter.package_name}}/Dockerfile
@@ -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 }}
@@ -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 \
@@ -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
diff --git a/{{cookiecutter.package_name}}/deployment/nginx/nginx.conf b/{{cookiecutter.package_name}}/deployment/nginx/nginx.conf
diff --git a/{{cookiecutter.package_name}}/deployment/nginx/uwsgi.conf b/{{cookiecutter.package_name}}/deployment/nginx/uwsgi.conf
diff --git a/{{cookiecutter.package_name}}/deployment/uwsgi/uwsgi.ini b/{{cookiecutter.package_name}}/deployment/uwsgi/uwsgi.ini
@@ -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
@@ -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/
 
 

diff --git a/{{cookiecutter.package_name}}/dockerrun.bash b/{{cookiecutter.package_name}}/dockerrun.bash