From e2f619846d8b514b2a529d6c0b4a5b77b588089f Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Sat, 9 Sep 2023 11:18:46 -0400 Subject: [PATCH] added Fedora 39 and Rawhide Docker files for testing --- Dockerfile.f39 | 80 ++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile.rawhide | 80 ++++++++++++++++++++++++++++++++++++++++++++++ bin/README.md | 4 +-- docker-compose.yml | 17 ++++++++-- 4 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 Dockerfile.f39 create mode 100644 Dockerfile.rawhide diff --git a/Dockerfile.f39 b/Dockerfile.f39 new file mode 100644 index 00000000..f6734166 --- /dev/null +++ b/Dockerfile.f39 @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- +# BSD 3-Clause License +# +# Apprise - Push Notification Library. +# Copyright (c) 2023, Chris Caron +# +# 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 diff --git a/Dockerfile.rawhide b/Dockerfile.rawhide new file mode 100644 index 00000000..3aa2c34f --- /dev/null +++ b/Dockerfile.rawhide @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- +# BSD 3-Clause License +# +# Apprise - Push Notification Library. +# Copyright (c) 2023, Chris Caron +# +# 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 diff --git a/bin/README.md b/bin/README.md index 5b64e34d..6d845adc 100644 --- a/bin/README.md +++ b/bin/README.md @@ -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 ``` diff --git a/docker-compose.yml b/docker-compose.yml index cf652300..824b2f31 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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