Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ fedora:
- !regexp fedora([0-9.]+)
centos:
- !regexp centos([0-9.]+)
rockylinux:
- !regexp rockylinux([0-9.]+)
ubuntu:
- bionic
- focal
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ focal:
service: suite

el8:
build: ./packagingenv/centos8
build: ./packagingenv/rockylinux8
extends:
file: docker-compose.override.yml
service: suite
Expand All @@ -37,7 +37,7 @@ focal-test:
service: suite-test

el8-test:
build: ./testingenv/centos8
build: ./testingenv/rockylinux8
extends:
file: docker-compose.override.yml
service: suite-test
Expand Down
4 changes: 2 additions & 2 deletions packagingenv/Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM {{ dist }}:{{ version }}

{% if dist in ('centos', 'fedora') -%}
{% if dist in ('centos', 'fedora', 'rockylinux') -%}

RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools

# Add NodeSource repo
RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -

{%- if version in ('centos8') %}
{%- if version in ('centos8', 'rockylinux8') %}

# Install development tools
RUN yum -y module install nodejs:10
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:8
FROM rockylinux:8

RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools

Expand Down
2 changes: 1 addition & 1 deletion testingenv/Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM {{ dist }}:{{ version }}

{% if dist in ('centos', 'fedora') -%}
{% if dist in ('centos', 'fedora', 'rockylinux') -%}

# Add NodeSource repo
RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:8
FROM rockylinux:8

# Add NodeSource repo
RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -
Expand Down
4 changes: 2 additions & 2 deletions update.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

:Example:

cd packagingenv/centos8
python ../ centos8
cd packagingenv/rockylinux8
python ../ rockylinux8

"""
import argparse
Expand Down