From d6c47ca2954a496aa999b39f4e6fdf2f65c81483 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Wed, 19 Nov 2025 19:05:00 -0500 Subject: [PATCH 1/2] Indent and convert tabs to spaces and --- docker/entity-api/Dockerfile | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docker/entity-api/Dockerfile b/docker/entity-api/Dockerfile index 9ab08a92..ddd373dd 100644 --- a/docker/entity-api/Dockerfile +++ b/docker/entity-api/Dockerfile @@ -37,27 +37,27 @@ 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 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 && \ - # Install the nginx default.conf file just installed in WORKDIR - mv nginx/nginx.conf /etc/nginx/nginx.conf && \ - # Clean up the nginx install directory in WORKDIR - [ ! -d nginx ] || mv nginx /tmp/nginx_from_WORKDIR && \ - # Push aside the verification file from the base image which will - # no longer report correctly once uWSGI is started for the service. - [ ! -f /tmp/verify_uwsgi.sh ] || mv /tmp/verify_uwsgi.sh /tmp/verify_uwsgi.sh.ORIGINAL && \ - # 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 a+x start.sh && \ - # Clean up artifacts to slim down this layer of the Docker Image - dnf clean all && \ - rm -rf /var/cache/dnf \ - /var/log/dnf \ - /var/log/yum \ - /root/.cache +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 && \ + # Install the nginx default.conf file just installed in WORKDIR + mv nginx/nginx.conf /etc/nginx/nginx.conf && \ + # Clean up the nginx install directory in WORKDIR + [ ! -d nginx ] || mv nginx /tmp/nginx_from_WORKDIR && \ + # Push aside the verification file from the base image which will + # no longer report correctly once uWSGI is started for the service. + [ ! -f /tmp/verify_uwsgi.sh ] || mv /tmp/verify_uwsgi.sh /tmp/verify_uwsgi.sh.ORIGINAL && \ + # 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 a+x start.sh && \ + # Clean up artifacts to slim down this layer of the Docker Image + dnf clean all && \ + rm -rf /var/cache/dnf \ + /var/log/dnf \ + /var/log/yum \ + /root/.cache # 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 269cd85a6d6b318c48f3a2befa6adfcf79078a0b Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Tue, 25 Nov 2025 18:48:15 -0500 Subject: [PATCH 2/2] Migrate to docker compose --- docker/docker-development.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-development.sh b/docker/docker-development.sh index d28334e1..a21166ec 100755 --- a/docker/docker-development.sh +++ b/docker/docker-development.sh @@ -83,7 +83,7 @@ else echo 'Checks complete, all good :)' elif [ "$1" = "config" ]; then - docker-compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api config + docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api config elif [ "$1" = "build" ]; then # Delete the copied source code dir if exists if [ -d "entity-api/src" ]; then