Build fixes after testing

README.md

@@ -251,7 +251,6 @@ Pre-built binaries of this module are provided for the following versions of NGI
 | Ubuntu 24.04 LTS (Noble Numbat) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.24.04.ngx_curity_http_phantom_token_module_1.25.5.so)    | X | X | X | X |
 | Amazon Linux 2                     | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.25.5.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.25.3.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.25.1.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.23.4.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.23.2.so)           |
 | Amazon Linux 2023                  | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.5.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.3.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.1.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.23.4.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.23.2.so)           |
-| CentOS 7.0+                        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.25.5.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.25.3.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.25.1.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.23.4.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.23.2.so)        |
 | CentOS Stream 9.0+                 | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.3.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.1.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.23.4.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.23.2.so) |
 
 ## Status

build.sh

@@ -16,7 +16,6 @@ if [ "$LINUX_DISTRO" != 'alpine' ] &&
    [ "$LINUX_DISTRO" != 'ubuntu24' ] &&
    [ "$LINUX_DISTRO" != 'amazon2' ] &&
    [ "$LINUX_DISTRO" != 'amazon2023' ] &&
-   [ "$LINUX_DISTRO" != 'centos7' ] &&
    [ "$LINUX_DISTRO" != 'centosstream9' ]; then
   echo "$LINUX_DISTRO is not a supported Linux distribution"
   exit 1
@@ -39,9 +38,7 @@ function getLibraryPrefix() {
     echo 'amzn2'
   elif [ "$LINUX_DISTRO" == 'amazon2023' ]; then
     echo 'amzn2023'
-  elif [ "$LINUX_DISTRO" == 'centos7' ]; then
-    echo 'centos.7'
-  elif [ "$PREFIX" == 'centosstream9' ]; then
+  elif [ "$LINUX_DISTRO" == 'centosstream9' ]; then
     echo 'centos.stream.9'
   fi
 }

buildall.sh

@@ -5,7 +5,7 @@
 ##################################################################################
 
 NGINX_VERSIONS=('1.25.5' '1.25.3' '1.25.1' '1.23.4' '1.23.2')
-LINUX_DISTROS=('alpine' 'debian11' 'debian12' 'ubuntu20' 'ubuntu22' 'ubuntu24' 'amazon2' 'amazon2023' 'centos7' 'centosstream9')
+LINUX_DISTROS=('alpine' 'debian11' 'debian12' 'ubuntu20' 'ubuntu22' 'ubuntu24' 'amazon2' 'amazon2023' 'centosstream9')
 rm log.txt 2>/dev/null
 
 #

dockerfiles/amazon2.Dockerfile

@@ -1,4 +1,4 @@
-FROM amazonlinux:2 as amzn2-builder
+FROM amazonlinux:2
 
 RUN yum install -y \
  gcc pcre-devel zlib-devel make

dockerfiles/amazon2023.Dockerfile

@@ -1,4 +1,4 @@
-FROM amazonlinux:2023 as amzn2023-builder
+FROM amazonlinux:2023
 
 RUN yum install -y \
  gcc pcre-devel zlib-devel make

dockerfiles/centosstream9.Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/centos/centos:stream9 as centos-stream9-builder
+FROM quay.io/centos/centos:stream9
 
 RUN yum install -y \
      gcc pcre-devel zlib-devel make

dockerfiles/debian11.Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye as debian11-builder
+FROM debian:bullseye
 
 RUN apt update && apt install -y \
     build-essential git tree software-properties-common dirmngr apt-transport-https ufw libpcre2-dev zlib1g-dev

dockerfiles/debian12.Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm as debian12-builder
+FROM debian:bookworm
 
 RUN apt update && apt install -y \
     build-essential git tree software-properties-common dirmngr apt-transport-https ufw libpcre2-dev zlib1g-dev

resources/memorytest/centosstream9/Dockerfile

@@ -8,7 +8,7 @@ FROM quay.io/centos/centos:stream9
 ARG NGINX_DEPLOY_VERSION
 
 RUN yum install -y yum-utils
-COPY centos7/nginx.repo /etc/yum.repos.d/nginx.repo
+COPY centosstream9/nginx.repo /etc/yum.repos.d/nginx.repo
 RUN yum-config-manager --enable nginx-mainline
 
 # 'yum list available nginx --showduplicates' shows versions available

resources/memorytest/run.sh

@@ -92,13 +92,6 @@ case $DISTRO in
     MODULE_FOLDER='/etc/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
-    ;;   
-
-  'centos7')
-    MODULE_FILE="centos.7.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
-    MODULE_FOLDER='/etc/nginx/modules'
-    NGINX_PATH='/usr/sbin/nginx'
-    CONF_PATH='/etc/nginx/nginx.conf'
     ;;
 
   'centosstream9')