Skip to content

Commit

Permalink
added Fedora 39 and Rawhide Docker files for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
caronc committed Sep 9, 2023
1 parent 524c1e9 commit e2f6198
Show file tree
Hide file tree
Showing 4 changed files with 177 additions and 4 deletions.
80 changes: 80 additions & 0 deletions Dockerfile.f39
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# -*- coding: utf-8 -*-
# BSD 3-Clause License
#
# Apprise - Push Notification Library.
# Copyright (c) 2023, Chris Caron <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

## The following was added to accomodate:
# https://bugzilla.redhat.com/show_bug.cgi?id=2216807
#
# the switch was added and it didn't work:
# dnf update -y --setopt=protected_packages=,
#
# The second work-around was to add --skip-broken
# This also didn't work. the final option was to download the RPMs in
# advance and just force them.
#
# Base
FROM fedora:39
ENV container docker

# https://bugzilla.redhat.com/show_bug.cgi?id=2216807 workaround
RUN dnf download -y --destdir BZ2216807 --resolve dnf-data && \
rpm -Uhi --force BZ2216807/*

RUN \
rm -f /usr/lib/systemd/system/multi-user.target.wants/*;\
rm -f /etc/systemd/system/*.wants/*;\
rm -f /usr/lib/systemd/system/local-fs.target.wants/*; \
rm -f /usr/lib/systemd/system/sockets.target.wants/*udev*; \
rm -f /usr/lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /usr/lib/systemd/system/basic.target.wants/*;\
rm -f /usr/lib/systemd/system/anaconda.target.wants/*; \
echo "assumeyes=1" >> /etc/dnf/dnf.conf; \
dnf install -y \
rpm-build rpmlint python3-pip rubygem-ronn \
dnf-plugins-core 'dnf-command(config-manager)' \
'dnf-command(builddep)' sudo rsync rpmdevtools;

COPY packaging/redhat/python-apprise.spec /
# Place our build file into the path
COPY bin/build-rpm.sh /usr/bin
RUN rpmspec -q --buildrequires /python-apprise.spec | cut -f1 -d' ' | \
xargs dnf install -y

# RPM Build Structure Setup
ENV FLAVOR=rpmbuild OS=centos DIST=f39
RUN useradd builder -u 1000 -m -G users,wheel &>/dev/null && \
echo "builder ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers

VOLUME ["/apprise"]
WORKDIR /apprise

# RPMs should never be built as root
USER builder
80 changes: 80 additions & 0 deletions Dockerfile.rawhide
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# -*- coding: utf-8 -*-
# BSD 3-Clause License
#
# Apprise - Push Notification Library.
# Copyright (c) 2023, Chris Caron <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

## The following was added to accomodate:
# https://bugzilla.redhat.com/show_bug.cgi?id=2216807
#
# the switch was added and it didn't work:
# dnf update -y --setopt=protected_packages=,
#
# The second work-around was to add --skip-broken
# This also didn't work. the final option was to download the RPMs in
# advance and just force them.
#
# Base
FROM fedora:rawhide
ENV container docker

# https://bugzilla.redhat.com/show_bug.cgi?id=2216807 workaround
RUN dnf download -y --destdir BZ2216807 --resolve dnf-data && \
rpm -Uhi --force BZ2216807/*

RUN \
rm -f /usr/lib/systemd/system/multi-user.target.wants/*;\
rm -f /etc/systemd/system/*.wants/*;\
rm -f /usr/lib/systemd/system/local-fs.target.wants/*; \
rm -f /usr/lib/systemd/system/sockets.target.wants/*udev*; \
rm -f /usr/lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /usr/lib/systemd/system/basic.target.wants/*;\
rm -f /usr/lib/systemd/system/anaconda.target.wants/*; \
echo "assumeyes=1" >> /etc/dnf/dnf.conf; \
dnf install -y \
rpm-build rpmlint python3-pip rubygem-ronn \
dnf-plugins-core 'dnf-command(config-manager)' \
'dnf-command(builddep)' sudo rsync rpmdevtools;

COPY packaging/redhat/python-apprise.spec /
# Place our build file into the path
COPY bin/build-rpm.sh /usr/bin
RUN rpmspec -q --buildrequires /python-apprise.spec | cut -f1 -d' ' | \
xargs dnf install -y

# RPM Build Structure Setup
ENV FLAVOR=rpmbuild OS=centos DIST=rawhide
RUN useradd builder -u 1000 -m -G users,wheel &>/dev/null && \
echo "builder ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers

VOLUME ["/apprise"]
WORKDIR /apprise

# RPMs should never be built as root
USER builder
4 changes: 2 additions & 2 deletions bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ Apprise is also packaged for Redhat/Fedora as an RPM. To verify this processs wo
# To test with el9; do the following:
docker-compose run --rm rpmbuild.el9 build-rpm.sh
# To test with f37; do the following:
docker-compose run --rm rpmbuild.f37 build-rpm.sh
# To test with f39; do the following:
docker-compose run --rm rpmbuild.f39 build-rpm.sh
```
17 changes: 15 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,19 @@ services:
volumes:
- ./:/apprise

rpmbuild.f39:
build:
context: .
dockerfile: Dockerfile.f39
volumes:
- ./:/apprise

rpmbuild.rawhide:
build:
context: .
dockerfile: Dockerfile.rawhide
volumes:
- ./:/apprise

#
# Every Day testing
Expand Down Expand Up @@ -82,5 +95,5 @@ services:
# - docker-compose run --rm rpmbuild.el8 build-rpm.sh
# el9
# - docker-compose run --rm rpmbuild.el9 build-rpm.sh
# f37 (Fedora)
# - docker-compose run --rm rpmbuild.f37 build-rpm.sh
# f39 (Fedora)
# - docker-compose run --rm rpmbuild.f39 build-rpm.sh

0 comments on commit e2f6198

Please sign in to comment.