diff --git a/dist.yml b/dist.yml index 0c8e52f..64f5b2e 100644 --- a/dist.yml +++ b/dist.yml @@ -2,6 +2,8 @@ fedora: - !regexp fedora([0-9.]+) centos: - !regexp centos([0-9.]+) +rockylinux: + - !regexp rockylinux([0-9.]+) ubuntu: - bionic - focal diff --git a/docker-compose.yml b/docker-compose.yml index 43d542c..d24c2fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ focal: service: suite el8: - build: ./packagingenv/centos8 + build: ./packagingenv/rockylinux8 extends: file: docker-compose.override.yml service: suite @@ -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 diff --git a/packagingenv/Dockerfile.template b/packagingenv/Dockerfile.template index 5ef9f88..d40f509 100755 --- a/packagingenv/Dockerfile.template +++ b/packagingenv/Dockerfile.template @@ -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 diff --git a/packagingenv/centos8/Dockerfile b/packagingenv/rockylinux8/Dockerfile similarity index 96% rename from packagingenv/centos8/Dockerfile rename to packagingenv/rockylinux8/Dockerfile index b740c03..d96bfde 100644 --- a/packagingenv/centos8/Dockerfile +++ b/packagingenv/rockylinux8/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux:8 RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools diff --git a/packagingenv/centos8/docker-entrypoint.sh b/packagingenv/rockylinux8/docker-entrypoint.sh similarity index 100% rename from packagingenv/centos8/docker-entrypoint.sh rename to packagingenv/rockylinux8/docker-entrypoint.sh diff --git a/testingenv/Dockerfile.template b/testingenv/Dockerfile.template index 94a7681..cfe14da 100644 --- a/testingenv/Dockerfile.template +++ b/testingenv/Dockerfile.template @@ -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 - diff --git a/testingenv/centos8/Dockerfile b/testingenv/rockylinux8/Dockerfile similarity index 92% rename from testingenv/centos8/Dockerfile rename to testingenv/rockylinux8/Dockerfile index f4c6dc1..426db9a 100755 --- a/testingenv/centos8/Dockerfile +++ b/testingenv/rockylinux8/Dockerfile @@ -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 - diff --git a/testingenv/centos8/docker-entrypoint.sh b/testingenv/rockylinux8/docker-entrypoint.sh similarity index 100% rename from testingenv/centos8/docker-entrypoint.sh rename to testingenv/rockylinux8/docker-entrypoint.sh diff --git a/update.py b/update.py index 3dae20e..091bd11 100644 --- a/update.py +++ b/update.py @@ -9,8 +9,8 @@ :Example: - cd packagingenv/centos8 - python ../ centos8 + cd packagingenv/rockylinux8 + python ../ rockylinux8 """ import argparse