Switch to nginx-stable release, turn off cache during build

Author: kburke

docker/docker-development.sh

@@ -106,7 +106,7 @@ else
         cp ../VERSION entity-api
         cp ../BUILD entity-api
 
-	docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api build
+	docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api build --no-cache
     elif [ "$1" = "start" ]; then
 	docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api up -d
     elif [ "$1" = "stop" ]; then

docker/entity-api/Dockerfile

@@ -13,22 +13,22 @@ WORKDIR /usr/src/app
 # Copy from host to image
 COPY . .
 
-# Set up the repository file for the mainline version of
+# Set up the repository file for the stable version of
 # nginx which dnf should use (in the legacy "yum" location.)
 RUN set -eux && \
     cat <<'EOF' > /etc/yum.repos.d/nginx.repo
-[nginx-mainline]
-name=nginx mainline repo
-baseurl=http://nginx.org/packages/mainline/centos/$releasever/$basearch/
+[nginx-stable]
+name=nginx stable repo
+baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
 gpgcheck=1
-enabled=0
+enabled=1
 gpgkey=https://nginx.org/keys/nginx_signing.key
 module_hotfixes=true
 EOF
 
 # Reduce the number of layers in image by minimizing the number of separate RUN commands
 # 1 - Install the prerequisites
-# 2 - By default, the repository for stable nginx packages is used. We would like to use mainline nginx packages
+# 2 - By default, the repository for stable nginx packages is used.
 # 3 - Install nginx (using the custom dnf/yum repo specified earlier)
 # 4 - Remove the default nginx config file
 # 5 - Overwrite the nginx.conf with ours to run nginx as non-root
@@ -37,9 +37,7 @@ EOF
 # 8 - Make the start script executable
 # 9 - Clean the dnf/yum cache and other locations to reduce Docker Image layer size.
 # Assume the base image has upgraded dnf and installed its dnf-plugins-core
- RUN dnf install --assumeyes dnf-plugins-core && \
-     dnf config-manager --enable nginx-mainline && \
-     dnf install --assumeyes nginx && \
+ RUN dnf install --assumeyes nginx && \
      # Push aside nginx default.conf files that may exist on the system
      [ ! -f /etc/nginx/conf.d/default.conf ] || mv /etc/nginx/conf.d/default.conf /tmp/etc_nginx_conf.d_default.conf.ORIGINAL && \
      [ ! -f /etc/nginx/nginx.conf ] || mv /etc/nginx/nginx.conf /tmp/etc_nginx_nginx.conf.ORIGINAL && \
@@ -53,7 +51,7 @@ EOF
      # Install the requirements.txt file for the service
      pip3.13 install --no-cache-dir --upgrade pip -r src/requirements.txt && \
      # Make the script referenced in the CMD directive below executable.
-     chmod 755 start.sh && \
+     chmod a+x start.sh && \
      # Clean up artifacts to slim down this layer of the Docker Image
      dnf clean all && \
      rm -rf /var/cache/dnf \
@@ -70,7 +68,7 @@ EXPOSE 5000 8080
 # the location referenced by the ENTRYPOINT directive below, and
 # make it executable.
 RUN mv entrypoint.sh /usr/local/bin/entrypoint.sh && \
-    chmod 755 /usr/local/bin/entrypoint.sh
+    chmod a+x /usr/local/bin/entrypoint.sh
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]