Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add centos-8 with updated python #3796

Closed
wants to merge 1 commit into from
+50 −3
Closed

feat: Add centos-8 with updated python #3796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/draft-release.yml
View file
Open in desktop
Expand Up @@ -103,6 +103,7 @@ jobs:
- { distro: 'debian-bullseye', pkg: 'deb', upload: 'true' }
- { distro: 'ubuntu-focal', pkg: 'deb', upload: 'true' }
- { distro: 'centos-7', pkg: 'rpm', upload: 'false' }
- { distro: 'centos-8', pkg: 'rpm', upload: 'false' }
- { distro: 'fedora-33', pkg: 'rpm', upload: 'false' }
fail-fast: false
env:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly-packages.yml
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ jobs:
- { distro: 'ubuntu-bionic', pkg: 'deb', upload: 'true' }
- { distro: 'ubuntu-focal', pkg: 'deb', upload: 'true' }
- { distro: 'centos-7', pkg: 'rpm', upload: 'false' }
- { distro: 'centos-8', pkg: 'rpm', upload: 'false' }
- { distro: 'fedora-33', pkg: 'rpm', upload: 'false' }
fail-fast: false
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packages.yml
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
matrix:
distro:
- centos-7
- centos-8
- debian-bullseye
- debian-testing
- fedora-33
Expand Down
1 change: 1 addition & 0 deletions dbld/Makefile.am
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ EXTRA_DIST += \
dbld/images/fedora.prepare.sh \
dbld/images/devshell.dockerfile \
dbld/images/centos-7.dockerfile \
dbld/images/centos-8.dockerfile \
dbld/images/fedora-33.dockerfile \
dbld/images/debian-stretch.dockerfile \
dbld/images/debian-buster.dockerfile \
Expand Down
1 change: 1 addition & 0 deletions dbld/build.manifest
View file
Open in desktop
Expand Up @@ -41,4 +41,5 @@ ubuntu-bionic python2,nocriterion,nokafka,nomqtt
ubuntu-focal python3,nocriterion,nomqtt

centos-7 python2
centos-8 python3,nojava
fedora python3
5 changes: 5 additions & 0 deletions dbld/builddeps
View file
Open in desktop
Expand Up @@ -116,6 +116,11 @@ function add_epel_repo {
$YUM_INSTALL epel-release
}

function add_powertools_repo {
$YUM_INSTALL dnf-plugins-core
dnf config-manager --set-enabled powertools
}

function install_apt_packages {
apt-get update -qq -o Acquire::CompressionTypes::Order::=gz
filter_packages_by_platform $DBLD_DIR/packages.manifest | xargs -t $APT_INSTALL --yes
Expand Down
30 changes: 30 additions & 0 deletions dbld/images/centos-8.dockerfile
View file
Open in desktop
@@ -0,0 +1,30 @@
FROM centos:8
LABEL maintainer="Andras Mitzki <andras.mitzki@balabit.com>, Laszlo Szemere <laszlo.szemere@balabit.com>, Balazs Scheidler <balazs.scheidler@oneidentity.com>"
ENV OS_DISTRIBUTION=centos
ENV OS_DISTRIBUTION_CODE_NAME=8

ARG ARG_IMAGE_PLATFORM
ARG COMMIT
ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM}
LABEL COMMIT=${COMMIT}

COPY images/fake-sudo.sh /usr/bin/sudo
COPY images/entrypoint.sh /
COPY . /dbld/

RUN /dbld/builddeps install_dbld_dependencies
RUN /dbld/builddeps add_epel_repo
RUN /dbld/builddeps add_copr_repo
RUN /dbld/builddeps add_powertools_repo
RUN /dbld/builddeps install_yum_packages
RUN /dbld/builddeps install_rpm_build_deps
RUN /dbld/builddeps install_pip_packages

RUN /dbld/builddeps install_criterion
RUN /dbld/builddeps install_gradle
RUN /dbld/builddeps install_gosu amd64

VOLUME /source
VOLUME /build

ENTRYPOINT ["/entrypoint.sh"]
6 changes: 4 additions & 2 deletions dbld/packages.manifest
View file
Open in desktop
Expand Up @@ -88,12 +88,14 @@ automake [centos, fedora]

python-dev [debian-stretch, debian-buster, ubuntu-xenial, ubuntu-bionic]
python2-dev [debian-sid]
python-devel [centos, fedora]
python-devel [centos-7, fedora]
python3-devel [fedora]
python-unversioned-command [fedora]
python3-dev [ubuntu-focal]
python-pip [centos, fedora, debian-stretch, debian-buster, ubuntu-trusty, ubuntu-xenial, ubuntu-bionic]
python-pip [centos-7, fedora, debian-stretch, debian-buster, ubuntu-trusty, ubuntu-xenial, ubuntu-bionic]
python3-pip [debian, ubuntu]
python39-devel [centos-8]
python39-pip [centos-8]

# libmongoc and libbson packages on various platforms
# Because we are using fixed version of libmongoc on Bionic, we need to
Expand Down
1 change: 1 addition & 0 deletions dbld/rules
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@

BUILDER_IMAGES= \
centos-7 \
centos-8 \
fedora-33 \
debian-stretch \
debian-buster \
Expand Down
5 changes: 5 additions & 0 deletions packaging/rhel/syslog-ng.spec
View file
Open in desktop
Expand Up @@ -27,13 +27,18 @@ Source4: syslog-ng.logrotate7
%bcond_without mqtt


%if 0%{?rhel} == 8
%global python_devel python39-devel
%global py_ver 3.9
%else
%if 0%{?rhel} == 7
%global python_devel python36-devel
%global py_ver 3.6
%else
%global python_devel python3-devel
%global py_ver %{python3_version}
%endif
%endif

%if 0%{?rhel} >= 7 || 0%{?fedora} <= 32
%bcond_without java
Expand Down