Merge pull request #342 from jajik/httpd

Fix ENV variable declaration in the test container, update fedora version to 42, tweak CI

Author: rhusar

.github/workflows/ci.yml

@@ -27,12 +27,12 @@ jobs:
           path: mod_proxy_cluster
       - name: Setup Podman
         run: |
-          sudo apt update
+          sudo apt-get update
           sudo apt-get -y install podman
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:41'
+              echo 'FROM fedora:42'
               echo 'RUN dnf install --assumeyes @c-development cmake httpd-devel ${{ matrix.compiler }}'
               echo 'RUN dnf clean all'
               echo 'COPY mod_proxy_cluster mod_proxy_cluster'
@@ -59,7 +59,7 @@ jobs:
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:41'
+              echo 'FROM fedora:42'
               echo 'RUN dnf install --assumeyes @c-development httpd-devel redhat-rpm-config'
               echo 'RUN dnf clean all'
               echo 'COPY mod_proxy_cluster mod_proxy_cluster'
@@ -157,7 +157,7 @@ jobs:
         run: |
           ls
           sudo apt-get update
-          sudo apt-get install cmake gcc cmake gcc make libtool libtool-bin python3 autoconf libxml2-dev libpcre2-dev -y
+          sudo apt-get install gcc cmake make libtool libtool-bin python3 autoconf libxml2-dev libpcre2-dev -y
       - name: Build httpd
         run: |
           ls
@@ -278,9 +278,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup dependencies
         run: |
-          sudo apt update
-          sudo apt remove apache2*
-          sudo apt install -y gcc make perl cpanminus libcrypt-ssleay-perl
+          sudo apt-get update
+          sudo apt-get remove apache2*
+          sudo apt-get install -y gcc make perl cpanminus libcrypt-ssleay-perl
       - name: Get Apache built in the previous job
         uses: actions/download-artifact@v4
         with:
@@ -320,7 +320,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Get doxygen
         run: |
-          sudo apt-get update -y
+          sudo apt-get update
           sudo apt-get install -y doxygen
       - name: Build doxygen docs
         run: doxygen

test/httpd/Containerfile

@@ -1,10 +1,9 @@
-FROM fedora:41 AS builder
+FROM fedora:42 AS builder
 
 ARG HTTPD_SOURCES="https://dlcdn.apache.org/httpd/httpd-2.4.65.tar.gz"
 
 RUN dnf install gcc apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config autoconf wcstools -y
 
-ENV CONF=httpd/mod_proxy_cluster.conf
 ENV HTTPD=${HTTPD_SOURCES}
 
 # make sure you have copy of the local repository at place
@@ -44,7 +43,9 @@ RUN for m in advertise mod_proxy_cluster balancers mod_manager; \
 
 RUN rm -rf /test/httpd/mod_proxy_cluster
 
-FROM fedora:41
+FROM fedora:42
+
+ENV CONF=httpd/mod_proxy_cluster.conf
 
 RUN dnf install pcre apr-util wcstools -y