chore(bump-image) (#4)

Dockerfile

@@ -1,7 +1,7 @@
 # To run: docker run -v /path/to/wsgi.py:/var/www/manifestservice/wsgi.py --name=manifestservice -p 81:80 manifestservice
 # To check running container: docker exec -it manifestservice /bin/bash
 
-FROM quay.io/cdis/python-nginx:1.3.0
+FROM quay.io/cdis/python-nginx:pybase3-1.0.0
 
 ENV appname=manifestservice
 
@@ -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 && pip install pipenv && pipenv install
@@ -40,4 +38,4 @@ RUN COMMIT=`git rev-parse HEAD` && echo "COMMIT=\"${COMMIT}\"" >$appname/version
 
 WORKDIR /var/www/$appname
 
-CMD /$appname/dockerrun.bash
+CMD /dockerrun.sh

Jenkinsfile

@@ -0,0 +1,6 @@
+#!groovy
+
+@Library('cdis-jenkins-lib@master') _
+
+testPipeline { 
+}

deployment/uwsgi/uwsgi.ini

@@ -1,7 +1,10 @@
 [uwsgi]
 protocol = uwsgi
-socket = /var/www/manifestservice/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=/manifestservice/wsgi.py
 plugins = python3
 vacuum = true
 chdir = /manifestservice/
-uid = nginx
-gid = nginx
 virtualenv = $(VENV)
 pythonpath = /usr/local/lib/python3.6/site-packages/