Update rpm package test environment (#100)

* Use AlmaLinux instead of CentOS for rpm package test CentOS is EOL. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com> * Fix README about CentOS Since CentOS is EOL now, we should replace the description about CentOS with another RHEL compatible OS. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com> --------- Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
fluent-plugins-nursery · Oct 16, 2023 · 3ec3769 · 3ec3769
1 parent 9ffe8e1
commit 3ec3769
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: test/docker/Dockerfile.ubuntu
-  tdagent:
+  tdagent-deb:
     runs-on: ubuntu-latest
     steps:
       -
@@ -34,7 +34,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: test/docker/Dockerfile.tdagent-ubuntu
-  centos:
+  tdagent-rpm:
     runs-on: ubuntu-latest
     steps:
       -
@@ -47,7 +47,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          file: test/docker/Dockerfile.tdagent-centos
+          file: test/docker/Dockerfile.tdagent-almalinux
   rubocop:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -18,7 +18,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: test/docker/Dockerfile.ubuntu
-  tdagent:
+  tdagent-deb:
     runs-on: ubuntu-latest
     steps:
       -
@@ -32,7 +32,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: test/docker/Dockerfile.tdagent-ubuntu
-  centos:
+  tdagent-rpm:
     runs-on: ubuntu-latest
     steps:
       -
@@ -45,7 +45,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          file: test/docker/Dockerfile.tdagent-centos
+          file: test/docker/Dockerfile.tdagent-almalinux
   rubocop:
     runs-on: ubuntu-latest
     steps:

diff --git a/README.md b/README.md
@@ -212,13 +212,13 @@ On Debian or Ubuntu you might need to install the libsystemd0 package:
 apt-get install libsystemd0
 ```
 
-On CentOS or RHEL you might need to install the systemd package:
+On AlmaLinux or RHEL you might need to install the systemd package:
 
 ```
 yum install -y systemd
 ```
 
-If you want to do this in a CentOS docker image you might first need to remove the `fakesystemd` package.
+If you want to do this in a AlmaLinux docker image you might first need to remove the `fakesystemd` package.
 
 ```
 yum remove -y fakesystemd

diff --git a/Rakefile b/Rakefile
@@ -16,7 +16,7 @@ task build: 'docker:test'
 task default: :rubocop
 
 namespace :docker do
-  distros = %i[ubuntu tdagent-ubuntu tdagent-centos]
+  distros = %i[ubuntu tdagent-ubuntu tdagent-almalinux]
   task test: distros
 
   distros.each do |distro|

diff --git a/test/docker/Dockerfile.tdagent-centos → test/docker/Dockerfile.tdagent-almalinux b/test/docker/Dockerfile.tdagent-centos → test/docker/Dockerfile.tdagent-almalinux
@@ -1,8 +1,8 @@
-FROM centos:8
+FROM almalinux:9
 
 RUN rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent \
       && printf "[treasuredata]\nname=TreasureData\nbaseurl=http://packages.treasuredata.com/4/redhat/\$releasever/\$basearch\ngpgcheck=1\ngpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent\n" > /etc/yum.repos.d/td.repo \
-      && yum install -y td-agent make gcc-c++ systemd
+      && dnf install -y td-agent make gcc-c++ systemd
 
 ENV PATH /opt/td-agent/bin/:$PATH
 RUN td-agent-gem install bundler