Skip to content

Commit

Permalink
update docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
ralequi committed Dec 12, 2023
1 parent 2e099f0 commit 3e1c968
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dockername: [fedora37, fedora38, fedora39]
dockername: [fedora38, fedora39, fedora40]
include:
- dockername: "fedora38"
- dockername: "fedora39"
extratags: ", naudit/rpm-builder:latest"
steps:
- name: Checkout
Expand Down
8 changes: 1 addition & 7 deletions Dockerfile.fedora39
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,10 @@ RUN dnf install -y \
&& dnf clean all \
&& rm -rf /var/cache/dnf

# Upgrade, as there are some buggy packages
RUN dnf5 upgrade -y \
&& dnf5 clean all \
&& rm -rf /var/cache/dnf*

# Install rpm macros for python development
RUN dnf5 install -y \
RUN dnf install -y \
dnf \
dnf-plugins-core \
dnf5-plugins \
python3-devel \
python3-rpm-macros \
python3-setuptools_scm+toml \
Expand Down
50 changes: 50 additions & 0 deletions Dockerfile.fedora40
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
FROM fedora:40

# Install base packages
RUN dnf install -y \
bash \
coreutils \
curl \
diffutils \
gcc \
git \
make \
patch \
python \
rpm-build \
rpm-devel \
rpmdevtools \
rpmlint \
wget \
&& dnf clean all \
&& rm -rf /var/cache/dnf

# Install rpm macros
RUN dnf install -y \
cmake-rpm-macros.noarch \
fedora-rpm-macros \
go-rpm-macros \
kernel-rpm-macros \
lua-rpm-macros \
lua-rpm-macros \
pyproject-rpm-macros \
python-rpm-macros \
python-srpm-macros \
python3-rpm-macros \
systemd-rpm-macros \
typelib-srpm-macros \
&& dnf clean all \
&& rm -rf /var/cache/dnf

# Install rpm macros for python development
RUN dnf install -y \
dnf \
dnf-plugins-core \
python3-devel \
python3-rpm-macros \
python3-setuptools_scm+toml \
python3-poetry \
python3-wheel \
&& dnf clean all \
&& rm -rf /var/cache/dnf

0 comments on commit 3e1c968

Please sign in to comment.