8.3.9 -> 8.3.10 & update for rocky9 build

.gitlab-ci.yml

@@ -12,6 +12,8 @@ stages:
 awsauth:
   stage: awsauth
   image: registry.containers.it.osu.edu/cache/gitlab-org/cloud-deploy/aws-base:latest
+  rules:
+    - !reference [.default_rules, rules]
   script:
     - if [ "${AWS_ACCESS_KEY_ID}" = "" ]; then echo "Missing AWS_ACCESS_KEY_ID"; exit 1; fi
     - if [ "${AWS_SECRET_ACCESS_KEY}" = "" ]; then echo "Missing AWS_SECRET_ACCESS_KEY"; exit 1; fi
@@ -22,6 +24,7 @@ awsauth:
   artifacts:
     reports:
       dotenv: awstoken.env
+  allow_failure: true
 
 build:
   stage: build
@@ -33,8 +36,11 @@ build:
   needs:
     - job: awsauth
       artifacts: true
+  rules:
+    - !reference [.default_rules, rules]
   script:
     - if [ $CI_COMMIT_REF_SLUG = "master" -o $CI_COMMIT_REF_SLUG = "main" ]; then TAG="latest"; fi
+    - if [ "$AWS_ECR_TOKEN" != "" ]; then ECRARG="--destination ${AWS_ECR_REGISTRY}/${CI_PROJECT_NAME}:${TAG}"; fi
     - echo "CS_IMAGE=${CI_REGISTRY_IMAGE}:${TAG}" >> build.env
     - |
       echo "
@@ -46,7 +52,7 @@ build:
                 \"${AWS_ECR_REGISTRY}\" : {
                     \"auth\" : \"$(printf "%s:%s" "AWS" "${AWS_ECR_TOKEN}" | base64 | tr -d '\n')\"
                 },
-                \"$CI_DEPENDENCY_PROXY_SERVER\":{
+                \"${CI_DEPENDENCY_PROXY_SERVER}\":{
                     \"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"
                 }
             }
@@ -54,24 +60,37 @@ build:
       " > /kaniko/.docker/config.json
     - |
       /kaniko/executor \
+        --single-snapshot \
         --context "${CI_PROJECT_DIR}" \
+        --git "branch=${CI_COMMIT_REF_SLUG},depth=1,single-branch=true,recurse-submodules=true,shallow-submodules=true" \
         --dockerfile "${CI_PROJECT_DIR}/Dockerfile" \
         --destination "${CI_REGISTRY_IMAGE}:${TAG}" \
-        --destination "${AWS_ECR_REGISTRY}/${CI_PROJECT_NAME}:${TAG}" \
-        --git "branch=${CI_COMMIT_REF_SLUG},depth=1,single-branch=true,recurse-submodules=true,shallow-submodules=true" \
-        --single-snapshot
+        ${ECRARG}
   retry: 2
   artifacts:
     reports:
       dotenv: build.env
 
 container_scanning:
+  rules:
+    - !reference [.default_rules, rules]
   dependencies:
     - build
 
 include:
   - template: Security/Container-Scanning.gitlab-ci.yml
 
+.default_rules:
+  rules:
+#    - changes:
+#      - "*.md"
+#      - ".*ignore"
+#      - Makefile
+#      - runlocal.sh
+#      - merge-from-base.sh
+#      when: never
+    - when: always
+
 trigger-drupal10:
   stage: trigger-drupal10
   trigger: wh/containerimages/wheks-drupal10

Dockerfile

@@ -3,33 +3,44 @@ LABEL maintainer="E. Stuart Hicks <hicks.367@osu.edu>"
 USER root
 
 # Install OS dev packages we need to compile modules against
-RUN yum -y group install "Development Tools"
-RUN yum -y install lynx cmake cmake3 re2c mariadb mod_fcgid libxml2-devel
-RUN yum -y install libxslt-devel gd-devel gmp-devel libc-client-devel
-RUN yum -y install libicu-devel unixODBC-devel aspell-devel postgresql-devel
-RUN yum -y install libmcrypt-devel libtidy-devel libaio-devel ImageMagick-devel
-RUN yum -y install ImageMagick-c++-devel libXpm-devel openssl-devel
-RUN yum -y install mariadb-devel curl-devel freetype-devel libpng-devel
-RUN yum -y install sqlite-devel GeoIP-devel mhash-devel libdb-devel
-RUN yum -y install openldap-devel readline-devel libmemcached-devel
-RUN yum -y install fastlz-devel libzstd-devel oniguruma-devel libyaml-devel
-RUN yum -y install glibc-devel ncurses-devel libzip-devel
+RUN dnf -y config-manager --enable crb
+RUN dnf -y install lynx git patch unzip p7zip
+RUN dnf -y install cmake re2c mariadb mod_fcgid
+RUN dnf -y install glibc-devel krb5-devel openssl-devel compat-openssl11
+RUN dnf -y install aspell-devel oniguruma-devel mhash-devel gmp-devel
+RUN dnf -y install readline-devel fastlz-devel 
+RUN dnf -y install libcurl-devel libzstd-devel libzip-devel
+RUN dnf -y install libxml2-devel libmcrypt-devel libxslt-devel libyaml-devel
+RUN dnf -y install libtidy-devel libaio-devel libmemcached-devel
+RUN dnf -y install unixODBC-devel mariadb-devel libpq-devel sqlite-devel
+RUN dnf -y install gd-devel ImageMagick-devel ImageMagick-c++-devel
+
+#RUN yum -y install libxslt-devel gd-devel gmp-devel libc-client-devel
+#RUN yum -y install libicu-devel unixODBC-devel aspell-devel postgresql-devel
+#RUN yum -y install libmcrypt-devel libtidy-devel libaio-devel ImageMagick-devel
+#RUN yum -y install ImageMagick-c++-devel libXpm-devel openssl-devel
+#RUN yum -y install mariadb-devel curl-devel freetype-devel libpng-devel
+#RUN yum -y install sqlite-devel GeoIP-devel mhash-devel libdb-devel
+#RUN yum -y install openldap-devel readline-devel libmemcached-devel
+#RUN yum -y install fastlz-devel libzstd-devel oniguruma-devel libyaml-devel
+#RUN yum -y install glibc-devel ncurses-devel libzip-devel
+
+RUN dnf -y group install "Development Tools"
 
 # External library builds
 COPY usr/local/src/ /usr/local/src/
+ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig
 WORKDIR /usr/local/src
 RUN tar zxf yaz-*.tar.gz && \
     cd yaz-*/ && \
     ./configure && \
     CORECOUNT=$(cat /proc/cpuinfo|egrep '^processor'|wc -l) nice make -j$(( $CORECOUNT + 1 )) && \
     make install
-ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
 # Install PHP
 RUN mkdir -pv /usr/local/etc/php /var/www/sharedtmp /var/www/privatedata
 RUN tar Jxf php-8.3.*.tar.xz && \
     cd php-8.3.*/ && \
-    PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig \
     ./configure \
        --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu \
        --target=x86_64-redhat-linux-gnu --program-prefix='' --disable-debug \
@@ -67,17 +78,17 @@ COPY usr/local/etc/php/conf.d/01_base_modules.ini /usr/local/etc/php/conf.d/
 # Build & install PECL modules
 RUN pecl channel-update pecl.php.net
 RUN printf "\n" | pecl install --force apcu
-#RUN pecl install --force geoip
-RUN git clone https://github.com/rlerdorf/geoip.git && \
-	cd geoip/ && \
-	phpize && \
-	./configure && \
-	make && make install && \
-	cd .. && \
-	rm -rfv geoip
+##RUN pecl install --force geoip
+#RUN git clone https://github.com/rlerdorf/geoip.git && \
+#	cd geoip/ && \
+#	phpize && \
+#	./configure && \
+#	make && make install && \
+#	cd .. && \
+#	rm -rfv geoip
 RUN pecl install --force igbinary
 #!#https://github.com/Imagick/imagick/issues/640
-#!#RUN printf "\n" | pecl install --force imagick
+RUN printf "\n" | pecl install --force imagick
 RUN printf "\n" | pecl install --force mcrypt
 RUN printf "\n\n\nyes\n\nyes\n\n\n\n" | pecl install --force memcached
 RUN printf "yes\nyes\nyes\n" | pecl install --force redis
@@ -110,11 +121,9 @@ RUN ln -sv /usr/local/bin/composer.phar /usr/local/bin/composer
 #RUN php /usr/local/bin/composer completion bash > /etc/profile.d/composer.sh
 
 # Clean up the build environment
-RUN yum -y group remove "Development Tools" \
-        --setopt=groupremove_leaf_only=1 \
+RUN dnf -y group remove "Development Tools" \
         --setopt=clean_requirements_on_remove=1
-RUN yum -y install git patch unzip p7zip
-RUN yum -y clean all
+RUN dnf -y clean all
 RUN rm -rf /var/cache/yum/ /tmp/* /usr/local/src/*
 
 # Any final setup / cleanup