Yuanzhou/deploy tweaks

VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

hubmap-auth/Dockerfile

@@ -27,17 +27,19 @@ module_hotfixes=true\n'\
 # 1 - Install the prerequisites
 # 2 - By default, the repository for stable nginx packages is used. We would like to use mainline nginx packages
 # 3 - Install nginx (using the custom yum repo specified earlier)
-# 4 - Overwrite the nginx.conf with ours to run nginx as non-root
-# 5 - Install flask app dependencies with pip (pip3 also works)
-# 6 - Make the start script executable
-# 7 - Clean all yum cache
+# 4 - Remove the default nginx config file
+# 5 - Overwrite the nginx.conf with ours to run nginx as non-root
+# 6 - Install flask app dependencies with pip (pip3 also works)
+# 7 - Make the start script executable
+# 8 - Clean all yum cache
 RUN yum install -y yum-utils && \
     yum-config-manager --enable nginx-mainline && \
     yum install -y nginx && \
+    rm /etc/nginx/conf.d/default.conf && \
     mv nginx.conf /etc/nginx/nginx.conf && \
     pip install -r src/requirements.txt && \
     chmod +x start.sh && \
-    yum clean all
+    yum clean all 
 
 # The EXPOSE instruction informs Docker that the container listens on the specified network ports at runtime. 
 # EXPOSE does not make the ports of the container accessible to the host.

hubmap-auth/entrypoint.sh

@@ -21,14 +21,13 @@ if [ $? -ne 0 ]; then
 fi
 
 # When running Nginx as a non-root user, we need to create the pid file
-# and give read and write access to a few directories
+# and give read and write access to /var/run/nginx.pid, /var/cache/nginx, and /var/log/nginx
 # In individual nginx *.conf, also don't listen on ports 80 or 443 because 
 # only root processes can listen to ports below 1024
 touch /var/run/nginx.pid
 chown -R hive:hive /var/run/nginx.pid
 chown -R hive:hive /var/cache/nginx
 chown -R hive:hive /var/log/nginx
-chown -R hive:hive /var/lib/nginx
 
 # No SSL in localhost mode
 if [ $DEPLOY_MODE != "localhost"  ]; then