From 88a3d3799daac33e8f91213d5a4d041e272a5a64 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Thu, 21 Nov 2024 12:37:11 -0500 Subject: [PATCH 1/3] Update VERSION to 2.2.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b1b25a5..5859406 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.2 +2.2.3 From df8f69f676b9297721a1c52b445365eaf28582c3 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Thu, 21 Nov 2024 12:38:38 -0500 Subject: [PATCH 2/3] Update Dockerfile --- hubmap-auth/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hubmap-auth/Dockerfile b/hubmap-auth/Dockerfile index a8a3257..e89df40 100644 --- a/hubmap-auth/Dockerfile +++ b/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. From e012c22064d8792513063afae4e07794435d4fa1 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Thu, 21 Nov 2024 12:39:21 -0500 Subject: [PATCH 3/3] Update entrypoint.sh --- hubmap-auth/entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hubmap-auth/entrypoint.sh b/hubmap-auth/entrypoint.sh index be4101c..fd37ddf 100644 --- a/hubmap-auth/entrypoint.sh +++ b/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