From 3ec3769c2b2fc04c6cb67967d31a70682d087305 Mon Sep 17 00:00:00 2001 From: Daijiro Fukuda Date: Mon, 16 Oct 2023 10:34:18 +0900 Subject: [PATCH] Update rpm package test environment (#100) * Use AlmaLinux instead of CentOS for rpm package test CentOS is EOL. Signed-off-by: Daijiro Fukuda * 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 --------- Signed-off-by: Daijiro Fukuda --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- README.md | 4 ++-- Rakefile | 2 +- ...ckerfile.tdagent-centos => Dockerfile.tdagent-almalinux} | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) rename test/docker/{Dockerfile.tdagent-centos => Dockerfile.tdagent-almalinux} (87%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cae623..f9417d3 100644 --- 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 index debdf5e..8829ffa 100644 --- 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 index 369a8b2..c218a8e 100644 --- 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 index a31a557..56a8a98 100644 --- 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 b/test/docker/Dockerfile.tdagent-almalinux similarity index 87% rename from test/docker/Dockerfile.tdagent-centos rename to test/docker/Dockerfile.tdagent-almalinux index 0d60198..9ef8151 100644 --- a/test/docker/Dockerfile.tdagent-centos +++ b/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