ci: upgrade to Fedora 40; remove unnecessary 'podman pull' to avoid v…

…ersion declaration duplication.
rhusar · Apr 29, 2024 · 656befb · 656befb
1 parent 60a3998
commit 656befb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,11 +23,10 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get -y install podman
-          podman pull fedora:39
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:39'
+              echo 'FROM fedora:40'
               echo 'RUN dnf install cmake httpd-devel ${{ matrix.compiler }} -y'
               echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
               echo 'RUN dnf clean all'
@@ -50,11 +49,10 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get -y install podman
-          podman pull fedora:39
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:39'
+              echo 'FROM fedora:40'
               echo 'RUN dnf install httpd-devel redhat-rpm-config -y'
               echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
               echo 'RUN dnf clean all'

diff --git a/test/httpd/Dockerfile b/test/httpd/Dockerfile
@@ -1,6 +1,6 @@
 ARG HTTPD_SOURCES="https://dlcdn.apache.org/httpd/httpd-2.4.59.tar.gz"
 
-FROM fedora:39
+FROM fedora:40
 
 RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf -y