Skip to content

Commit 8d2d67a

Browse files
authored
Merge pull request #866 from rhusar/1.3.x-containerfile
CI: Standardize on 'Containerfile' naming and Upgrade to Fedora 41
2 parents 59ea079 + de4831f commit 8d2d67a

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,18 @@ jobs:
4545
run: |
4646
sudo apt update
4747
sudo apt-get -y install podman
48-
podman pull fedora:39
4948
- name: Create container and build
5049
run: |
5150
{
52-
echo 'FROM fedora:40'
53-
echo 'RUN dnf install cmake httpd-devel ${{ matrix.compiler }} -y'
54-
echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
51+
echo 'FROM fedora:41'
52+
echo 'RUN dnf install --assumeyes @c-development cmake httpd-devel ${{ matrix.compiler }}'
5553
echo 'RUN dnf clean all'
5654
echo 'COPY mod_proxy_cluster mod_proxy_cluster'
5755
echo 'WORKDIR /mod_proxy_cluster/native'
5856
echo 'RUN cmake . -DCMAKE_C_COMPILER=${{ matrix.compiler }}'
5957
echo 'RUN make'
60-
} > podmanfile
61-
podman build -f ./podmanfile
58+
} > Containerfile
59+
podman build .
6260
name: cmake-fedora-latest
6361

6462
make-fedora-latest:
@@ -72,13 +70,11 @@ jobs:
7270
run: |
7371
sudo apt update
7472
sudo apt-get -y install podman
75-
podman pull fedora:39
7673
- name: Create container and build
7774
run: |
7875
{
79-
echo 'FROM fedora:40'
80-
echo 'RUN dnf install httpd-devel redhat-rpm-config -y'
81-
echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
76+
echo 'FROM fedora:41'
77+
echo 'RUN dnf install --assumeyes @c-development httpd-devel redhat-rpm-config'
8278
echo 'RUN dnf clean all'
8379
echo 'COPY mod_proxy_cluster mod_proxy_cluster'
8480
echo 'WORKDIR /mod_proxy_cluster/native'
@@ -93,8 +89,8 @@ jobs:
9389
echo ' make || exit 1; \'
9490
echo ' cd ..; \'
9591
echo 'done;'
96-
} > podmanfile
97-
podman build -f ./podmanfile
92+
} > Containerfile
93+
podman build .
9894
9995
make-with-httpd-trunk:
10096
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)